Merge branch 'tizen_dev' into tizen 25/85525/1 submit/tizen/20160825.141343
authorAndrey Klimenko <and.klimenko@samsung.com>
Thu, 25 Aug 2016 13:20:12 +0000 (16:20 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Thu, 25 Aug 2016 13:20:22 +0000 (16:20 +0300)
Change-Id: I89d56a76f7d67dd8949a524d027464d3b2774c6e
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge