Merge branch 'upstream' into tizen
authorYoungbok Shin <youngb.shin@samsung.com>
Thu, 23 Jun 2016 00:52:10 +0000 (09:52 +0900)
committerYoungbok Shin <youngb.shin@samsung.com>
Thu, 23 Jun 2016 00:52:10 +0000 (09:52 +0900)

Trivial merge