diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-06-09 10:19:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-09 10:19:14 -0700 |
| commit | 2e0f71181792780b55826bcc562ae79951e76f1b (patch) | |
| tree | 3e84721d78a7fa63ce7d73906b47da1e3f89b579 /tools/aidl/generate_java.cpp | |
| parent | 3aabdeaceff8405406d90c329a6691552559556d (diff) | |
| parent | 8ee28811ad208d224ac8d317e4644aabc9ffb886 (diff) | |
am 8ee28811: Merge changes Idbb70f53,I10426a3f into honeycomb-mr2
* commit '8ee28811ad208d224ac8d317e4644aabc9ffb886':
Merge 06942bc4 from hc-mr1.
Merge 988eeeb5 from hc-mr1.
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions