Merge remote-tracking branch 'origin/tizen' into tizen_3.0 73/103273/1 accepted/tizen/3.0/mobile/20161208.063808 submit/tizen_3.0/20161208.014952
authorkiso.chang <kiso.chang@samsung.com>
Thu, 8 Dec 2016 01:47:04 +0000 (10:47 +0900)
committerkiso.chang <kiso.chang@samsung.com>
Thu, 8 Dec 2016 01:47:35 +0000 (10:47 +0900)
Change-Id: I21486096bd988cc29d01a7fa8c00420fc3118929
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

Trivial merge