Merge branch 'tizen' into tizen_4.0 04/160004/1 accepted/tizen/4.0/unified/20171115.173843 submit/tizen_4.0/20171115.020533
authorhj kim <backto.kim@samsung.com>
Tue, 14 Nov 2017 05:32:43 +0000 (14:32 +0900)
committerhj kim <backto.kim@samsung.com>
Tue, 14 Nov 2017 05:33:05 +0000 (14:33 +0900)
Change-Id: Id1e7dc3ecc933928fc766965f71b7c2ba2b24eb9


Trivial merge