| commit | 1cd2834fde49738d9d884ed193bffa986224204d | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Jan 27 12:07:15 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 27 12:07:15 2014 +0000 |
| tree | 2d88b9fa7fa7931d938241f413ab6f575eccc0f2 | |
| parent | dafb2420a34a5b39aca6ddf993e86778edd76b5d [diff] | |
| parent | 30e20ac528731a778eec45506d1e57c8839b318a [diff] |
am 30e20ac5: am ebd43d46: am dff83e2b: am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*." * commit '30e20ac528731a778eec45506d1e57c8839b318a': AssetManager cookies should be int32_t and not void*.