Merge remote-tracking branch 'origin/tizen' into tizen_3.0 89/100089/1
authorkiso.chang <kiso.chang@samsung.com>
Fri, 25 Nov 2016 06:19:32 +0000 (15:19 +0900)
committerkiso.chang <kiso.chang@samsung.com>
Fri, 25 Nov 2016 06:20:11 +0000 (15:20 +0900)
Change-Id: I003f4fa9832b59a1952d3e55484f0e5f2460e99e
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

Trivial merge