Merge branch 'tizen' into tizen_3.0 92/95092/1 submit/tizen_3.0/20161102.095324
authorAndrey Klimenko <and.klimenko@samsung.com>
Wed, 2 Nov 2016 09:31:06 +0000 (11:31 +0200)
committerAndrey Klimenko <and.klimenko@samsung.com>
Wed, 2 Nov 2016 09:31:18 +0000 (11:31 +0200)
Change-Id: If408f2d37a34773b0df6e04a894bc01018305cfb
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge