Merge branch 'tizen_dev' into tizen 20/83420/1 submit/tizen/20160810.144952
authorAndrey Klimenko <and.klimenko@samsung.com>
Wed, 10 Aug 2016 14:43:59 +0000 (17:43 +0300)
committerAndrey Klimenko <and.klimenko@samsung.com>
Wed, 10 Aug 2016 14:44:07 +0000 (17:44 +0300)
Change-Id: I3505a3faea6e78f112f62ebff4e01952144f3ea1
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge