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)
commit98010d29dbcf3fa4849550a0cc448057f8e15a44
treed2e4a5ac152563e2354adae682f470c17f7d56f6
parent4ecddb67948044c87653c93f8674a9ddaac7b64f
parentdf88f72dae564eab44d6a09effdb56412db95951
Merge branch 'upstream' into tizen