Merge branch 'upstream' into tizen
authorBowon Ryu <bowon.ryu@samsung.com>
Fri, 12 Apr 2019 04:22:42 +0000 (13:22 +0900)
committerBowon Ryu <bowon.ryu@samsung.com>
Fri, 12 Apr 2019 04:22:42 +0000 (13:22 +0900)

Trivial merge