[0.6.68] Merge branch 'tizen' into tizen_4.0 16/149516/2 accepted/tizen/4.0/unified/20170913.153818 submit/tizen_4.0/20170913.041751
authorEunhae Choi <eunhae1.choi@samsung.com>
Tue, 12 Sep 2017 09:46:07 +0000 (18:46 +0900)
committerEunhae Choi <eunhae1.choi@samsung.com>
Tue, 12 Sep 2017 10:43:56 +0000 (19:43 +0900)
Change-Id: I18874a714a2063ec39dc3a3856f34ef096b8a4b3


Trivial merge