Merge branch 'tizen' into tizen_4.0 36/151836/1 submit/tizen_4.0/20170922.073546 submit/tizen_4.0/20170922.081148
authorJiyong Min <jiyong.min@samsung.com>
Fri, 22 Sep 2017 06:06:02 +0000 (15:06 +0900)
committerJiyong Min <jiyong.min@samsung.com>
Fri, 22 Sep 2017 06:11:08 +0000 (15:11 +0900)
Change-Id: Ic188c172f1a5d56414f54414e88a1b9839000023


Trivial merge