OSDN Git Service

am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."
authorNarayan Kamath <narayan@google.com>
Mon, 27 Jan 2014 12:01:15 +0000 (04:01 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jan 2014 12:01:15 +0000 (04:01 -0800)
commitebd43d46ebf53005ae60af59948f8ed634f9bafb
tree736885eba35ebf5adea0c2237263220c3c847f51
parentd165f365b394b7632d8a0cfbc14bbf4004858333
parentdff83e2b121b356a264e908f8a7d64584eab9b73
am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."

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