Merge remote-tracking branch 'origin/tizen' into tizen_3.0 66/103966/1 submit/tizen_3.0/20161212.024246
authorkiso.chang <kiso.chang@samsung.com>
Mon, 12 Dec 2016 02:39:17 +0000 (11:39 +0900)
committerkiso.chang <kiso.chang@samsung.com>
Mon, 12 Dec 2016 02:39:33 +0000 (11:39 +0900)
Change-Id: I7fa208cdb64205dcff693f1ec80e8bb33ff5faaf
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

Trivial merge