Merge branch 'upstream' into tizen 38/199738/1
authorBowon Ryu <bowon.ryu@samsung.com>
Thu, 14 Feb 2019 10:04:20 +0000 (19:04 +0900)
committerBowon Ryu <bowon.ryu@samsung.com>
Thu, 14 Feb 2019 10:07:29 +0000 (19:07 +0900)
Change-Id: Ib7fd24e86a79df725eff04fed366a7d111f781be


Trivial merge