Merge branch 'tizen' into tizen_3.0 91/95091/1 submit/tizen_3.0/20161102.095350
authorAndrey Klimenko <and.klimenko@samsung.com>
Wed, 2 Nov 2016 09:22:42 +0000 (11:22 +0200)
committerAndrey Klimenko <and.klimenko@samsung.com>
Wed, 2 Nov 2016 09:23:08 +0000 (11:23 +0200)
Change-Id: Ieab324f78a0aa16bf4cf0244828b4d0bf622e6e1
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge