diff options
| author | Narayan Kamath <narayan@google.com> | 2014-01-27 04:01:15 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-27 04:01:15 -0800 |
| commit | ebd43d46ebf53005ae60af59948f8ed634f9bafb (patch) | |
| tree | 736885eba35ebf5adea0c2237263220c3c847f51 /tools/aidl/generate_java.cpp | |
| 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*.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions