Merge branch 'upstream' into tizen
authorYoungbok Shin <youngb.shin@samsung.com>
Mon, 22 Aug 2016 07:12:41 +0000 (16:12 +0900)
committerYoungbok Shin <youngb.shin@samsung.com>
Mon, 22 Aug 2016 07:12:41 +0000 (16:12 +0900)
commit9fe7742f424040af5b828071cf8eae04852a5686
treedb0f02e568d088e8cf6876ee9406e664459595ca
parent086d1706b2fded692118bd178598e69f8435d3ba
parente8e3a59d74b93e80f83e2fbd41cc23fd205f47f6
Merge branch 'upstream' into tizen