diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-05-24 02:57:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-24 02:57:11 -0700 |
| commit | 690a9bb8ade4d5639cbdbd1120e29e280819cdca (patch) | |
| tree | 9a5c708514e448d5bf392088930e496a04b77d6d /tools/aidl/generate_java.cpp | |
| parent | 3dbc571e62d8c63a55f5e2e58ea22aa6ebf0df39 (diff) | |
| parent | 162dd490cd0b502c717db59300b3fd902f76710a (diff) | |
am 162dd490: (-s ours) am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread
* commit '162dd490cd0b502c717db59300b3fd902f76710a':
Merge 2fae858d from Honeycomb-mr1. do not merge.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions