diff options
| author | Irfan Sheriff <isheriff@google.com> | 2011-12-07 12:10:58 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-07 12:10:58 -0800 |
| commit | a6071c338b0f46a47fe9c4bce87d4684e3c93dc7 (patch) | |
| tree | 1709026d4149a6621103eeb946b7bc9ffa0d4b69 /tools/aidl/generate_java.cpp | |
| parent | 63051d71ef3da31c9764f6998e275adedbbcd9f5 (diff) | |
| parent | 8c2122cb3e347c607126c49d76fb165125a02295 (diff) | |
am 8c2122cb: am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
* commit '8c2122cb3e347c607126c49d76fb165125a02295':
Fix CS wakelock handling
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions