| commit | ebd43d46ebf53005ae60af59948f8ed634f9bafb | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Jan 27 04:01:15 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 27 04:01:15 2014 -0800 |
| tree | 736885eba35ebf5adea0c2237263220c3c847f51 | |
| parent | d165f365b394b7632d8a0cfbc14bbf4004858333 [diff] | |
| parent | dff83e2b121b356a264e908f8a7d64584eab9b73 [diff] |
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*.