OSDN Git Service

am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t...
authorNarayan Kamath <narayan@google.com>
Mon, 27 Jan 2014 12:04:30 +0000 (12:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 27 Jan 2014 12:04:30 +0000 (12:04 +0000)
commit30e20ac528731a778eec45506d1e57c8839b318a
tree98ef57ffe9bc61900414bc35f3d5b7a237c48220
parentd4b688cf97736eb4c543149686ab851b9ea21161
parentebd43d46ebf53005ae60af59948f8ed634f9bafb
am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*."

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