Merge branch 'tizen' into tizen_3.0 46/111746/1 tizen_3.0_tv accepted/tizen/3.0/common/20170124.081409 accepted/tizen/3.0/ivi/20170124.043754 accepted/tizen/3.0/mobile/20170124.043648 accepted/tizen/3.0/tv/20170124.043733 submit/tizen_3.0/20170124.013155
authorJihoon Kim <jihoon48.kim@samsung.com>
Tue, 24 Jan 2017 01:22:26 +0000 (10:22 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Tue, 24 Jan 2017 01:22:42 +0000 (10:22 +0900)
Change-Id: Ia7d49ccd6fa16f9feb74d7a5c8bc5facd466df2c


Trivial merge