diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-05-23 10:21:49 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-23 10:21:49 -0700 |
| commit | 162dd490cd0b502c717db59300b3fd902f76710a (patch) | |
| tree | 662e6a15ff9d526ed70163eee15d41cdd9360f45 /tools/aidl/generate_java.cpp | |
| parent | 6056e3268a0aa114ad99e3e6ddaebe0ebfa6035e (diff) | |
| parent | 9d9a7466cd051748ba656acd39265099294c4153 (diff) | |
am 9d9a7466: (-s ours) am bb43828a: Merge "Merge 2fae858d from Honeycomb-mr1. do not merge." into gingerbread
* commit '9d9a7466cd051748ba656acd39265099294c4153':
Merge 2fae858d from Honeycomb-mr1. do not merge.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions