Merge remote-tracking branch 'origin/tizen_3.0' into tizen 93/100093/1
authorkiso.chang <kiso.chang@samsung.com>
Fri, 25 Nov 2016 06:22:39 +0000 (15:22 +0900)
committerkiso.chang <kiso.chang@samsung.com>
Fri, 25 Nov 2016 06:23:21 +0000 (15:23 +0900)
Change-Id: I93c0ffebbe202ff43f00e540cbcb983a560fdb3c
Signed-off-by: kiso.chang <kiso.chang@samsung.com>

Trivial merge