Merge branch 'tizen' into tizen_dev 82/89682/1
authorAndrey Klimenko <and.klimenko@samsung.com>
Mon, 26 Sep 2016 10:12:23 +0000 (13:12 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Mon, 26 Sep 2016 10:12:42 +0000 (13:12 +0300)
Change-Id: Ie29384dd4e06ccfc4ed10ed4d8102f8b48a47392
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge