Merge branch 'upstream' into tizen
authorYoungbok Shin <youngb.shin@samsung.com>
Mon, 22 Aug 2016 06:15:55 +0000 (15:15 +0900)
committerYoungbok Shin <youngb.shin@samsung.com>
Mon, 22 Aug 2016 06:15:55 +0000 (15:15 +0900)

Trivial merge