Merge branch 'upstream' into tizen
authorYoungbok Shin <youngb.shin@samsung.com>
Mon, 25 Jun 2018 10:27:29 +0000 (19:27 +0900)
committerYoungbok Shin <youngb.shin@samsung.com>
Mon, 25 Jun 2018 10:27:29 +0000 (19:27 +0900)

Trivial merge