Merge branch 'upstream' into tizen 46/199746/1
authorBowon Ryu <bowon.ryu@samsung.com>
Thu, 14 Feb 2019 10:33:34 +0000 (19:33 +0900)
committerBowon Ryu <bowon.ryu@samsung.com>
Thu, 14 Feb 2019 10:34:53 +0000 (19:34 +0900)
Change-Id: Icff684cf8ab4ac4456455bede5a22a2fc3bca6a4


Trivial merge