Merge branch 'tizen' into tizen_dev 56/83556/1
authorAndrey Klimenko <and.klimenko@samsung.com>
Thu, 11 Aug 2016 13:27:37 +0000 (16:27 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Thu, 11 Aug 2016 13:27:44 +0000 (16:27 +0300)
Change-Id: I732170749819caf0f76a72aa795cb8fb3295fbad
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge