| commit | dff83e2b121b356a264e908f8a7d64584eab9b73 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Mon Jan 27 03:58:32 2014 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 27 03:58:32 2014 -0800 |
| tree | 34f4777620db60c916924fe1306eb4bbfbd9b395 | |
| parent | 5d2d911ad1f69392cf2a56237ce7ad3bb9e78ffa [diff] | |
| parent | d5970e9ca34038051f694c7349fa5f3548ee9499 [diff] |
am d5970e9c: Merge "AssetManager cookies should be int32_t and not void*." * commit 'd5970e9ca34038051f694c7349fa5f3548ee9499': AssetManager cookies should be int32_t and not void*.