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