OSDN Git Service

am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
authorNarayan Kamath <narayan@google.com>
Mon, 27 Jan 2014 11:58:32 +0000 (03:58 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jan 2014 11:58:32 +0000 (03:58 -0800)
commitdff83e2b121b356a264e908f8a7d64584eab9b73
tree34f4777620db60c916924fe1306eb4bbfbd9b395
parent5d2d911ad1f69392cf2a56237ce7ad3bb9e78ffa
parentd5970e9ca34038051f694c7349fa5f3548ee9499
am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."

* commit 'd5970e9ca34038051f694c7349fa5f3548ee9499':
  AssetManager cookies should be int32_t and not void*.