| commit | 30e20ac528731a778eec45506d1e57c8839b318a | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Jan 27 12:04:30 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 27 12:04:30 2014 +0000 |
| tree | 98ef57ffe9bc61900414bc35f3d5b7a237c48220 | |
| parent | d4b688cf97736eb4c543149686ab851b9ea21161 [diff] | |
| parent | ebd43d46ebf53005ae60af59948f8ed634f9bafb [diff] |
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*.