Merge remote-tracking branch 'origin/tizen' into tizen_3.0 53/104253/1 accepted/tizen/3.0/mobile/20161213.064836 submit/tizen_3.0/20161213.021715
authorkiso.chang <kiso.chang@samsung.com>
Tue, 13 Dec 2016 02:11:58 +0000 (11:11 +0900)
committerkiso.chang <kiso.chang@samsung.com>
Tue, 13 Dec 2016 02:12:28 +0000 (11:12 +0900)
Change-Id: Iec918fa444ff4f43d2fa655fe00bb6760a7a018c
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

Trivial merge