Merge branch 'tizen' into tizen_4.0 14/150614/1
authorGilbok Lee <gilbok.lee@samsung.com>
Mon, 18 Sep 2017 05:17:22 +0000 (14:17 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Mon, 18 Sep 2017 05:17:30 +0000 (14:17 +0900)
Change-Id: I3b6e1e4e68d3a3b1c77216d2e8d3d87d8aa40069


Trivial merge