Merge branch 'upstream' into tizen
authorYoungbok Shin <youngb.shin@samsung.com>
Tue, 26 Jun 2018 02:17:46 +0000 (11:17 +0900)
committerYoungbok Shin <youngb.shin@samsung.com>
Tue, 26 Jun 2018 02:17:46 +0000 (11:17 +0900)

Trivial merge