Merge branch 'upstream' into tizen 20/199720/1
authorBowon Ryu <bowon.ryu@samsung.com>
Thu, 14 Feb 2019 08:35:22 +0000 (17:35 +0900)
committerBowon Ryu <bowon.ryu@samsung.com>
Thu, 14 Feb 2019 08:36:30 +0000 (17:36 +0900)
Change-Id: Ieaf0e707b5610c8e76cf1182789e5b3d105876f2


Trivial merge