Merge branch 'upstream' into tizen
authorYoungbok Shin <youngb.shin@samsung.com>
Mon, 22 Aug 2016 02:27:37 +0000 (11:27 +0900)
committerYoungbok Shin <youngb.shin@samsung.com>
Mon, 22 Aug 2016 02:27:37 +0000 (11:27 +0900)
commitcd47b368a57e499f546c601640a73f4035ad6285
tree8412962809a86d4fc85d62342dfdc97913703a2e
parenta0b6772c617e3db5858f6b6a45f3e2d3c6146a4f
parent5200acdbfd74b4eda74180a84ba3c53f170d95f0
Merge branch 'upstream' into tizen