Merge branch 'tizen' into tizen_4.0 51/147451/1 accepted/tizen/4.0/unified/20170904.234752 submit/tizen_4.0/20170904.103034
authorGilbok Lee <gilbok.lee@samsung.com>
Mon, 4 Sep 2017 10:28:30 +0000 (19:28 +0900)
committerGilbok Lee <gilbok.lee@samsung.com>
Mon, 4 Sep 2017 10:28:37 +0000 (19:28 +0900)
Change-Id: I4f0389a6c1bd64d3152e0df46deb08bdc5807cac


Trivial merge