Merge branch 'tizen_3.0' into tizen 52/109052/1 submit/tizen/20170106.142915
authorAndrey Klimenko <and.klimenko@samsung.com>
Fri, 6 Jan 2017 14:23:38 +0000 (16:23 +0200)
committerAndrey Klimenko <and.klimenko@samsung.com>
Fri, 6 Jan 2017 14:23:44 +0000 (16:23 +0200)
Change-Id: Ic706bd53867a5337c74986f167226346f37d37d9
Signed-off-by: Andrey Klimenko <and.klimenko@samsung.com>

Trivial merge