Merge branch 'tizen' into tizen_4.0 06/172006/1 submit/tizen_4.0/20180308.104524 submit/tizen_4.0/20180312.080332
authorSejun Park <sejun79.park@samsung.com>
Fri, 9 Mar 2018 01:22:21 +0000 (10:22 +0900)
committerSejun Park <sejun79.park@samsung.com>
Fri, 9 Mar 2018 01:22:48 +0000 (10:22 +0900)
Change-Id: Idb074aa460874cee92a5a316736b7ee2e52c6834


Trivial merge