diff options
author | Andreas Huber <andih@google.com> | 2011-12-06 16:22:07 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-12-06 16:22:07 -0800 |
commit | 92860d5d4681e684d5f3936137c6c067c950121e (patch) | |
tree | 66aea5e7186e31c9faa0ec2df85b20bcf9bd48d0 /tools/aidl/generate_java.cpp | |
parent | 596859549254a63c619fdc403e49e809751ab832 (diff) | |
parent | 791a31832ab586f056c2bcab8e0515d4bb1e2f7a (diff) |
am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1
* commit '791a31832ab586f056c2bcab8e0515d4bb1e2f7a':
DO NOT MERGE: Remove the AVI extractor.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions