Merge branch 'tizen' into tizen_dev 50/76350/1
authorAndrey Klimenko <and.klimenko@samsung.com>
Thu, 23 Jun 2016 12:13:51 +0000 (15:13 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Thu, 23 Jun 2016 12:13:56 +0000 (15:13 +0300)
Change-Id: I6fe42046b2ac06a0fc43993075826635eaf4485b
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge