Merge remote-tracking branch 'origin/tizen' into tizen_3.0 40/105540/1 accepted/tizen/3.0/mobile/20161219.091444 submit/tizen_3.0/20161219.032640
authorkiso.chang <kiso.chang@samsung.com>
Mon, 19 Dec 2016 03:25:05 +0000 (12:25 +0900)
committerkiso.chang <kiso.chang@samsung.com>
Mon, 19 Dec 2016 03:25:16 +0000 (12:25 +0900)
Change-Id: I9574b9080f85affca652f6446c1fd654d7c30d56
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

Trivial merge