Merge branch 'tizen' into tizen_4.0 54/146654/1 submit/tizen_4.0/20170831.002804 submit/tizen_4.0/20170904.013119
authorDoHyun Pyun <dh79.pyun@samsung.com>
Wed, 30 Aug 2017 02:56:16 +0000 (11:56 +0900)
committerDoHyun Pyun <dh79.pyun@samsung.com>
Wed, 30 Aug 2017 02:56:24 +0000 (11:56 +0900)
Change-Id: Ic3a792f6db826008c695da00ebdd5c9f56850325
Signed-off-by: DoHyun Pyun <dh79.pyun@samsung.com>

Trivial merge