Merge branch 'tizen' into tizen_dev 04/74204/1
authorAndrey Klimenko <and.klimenko@samsung.com>
Mon, 13 Jun 2016 07:34:24 +0000 (10:34 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Mon, 13 Jun 2016 07:34:32 +0000 (10:34 +0300)
Change-Id: I90ab348ff39a6cdcebe3d1fa886736aea3a079b4
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge