Merge remote-tracking branch 'origin/tizen' into tizen_3.0 19/109319/1
authorKiseok Chang <kiso.chang@samsung.com>
Tue, 10 Jan 2017 03:18:37 +0000 (12:18 +0900)
committerKiseok Chang <kiso.chang@samsung.com>
Tue, 10 Jan 2017 03:19:08 +0000 (12:19 +0900)
Change-Id: I4902f13a050c62196bd2340e9908c1002b73e165
Signed-off-by: Kiseok Chang <kiso.chang@samsung.com>

Trivial merge