diff options
| author | Baligh Uddin <baligh@google.com> | 2012-10-29 17:15:11 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-29 17:15:11 -0700 |
| commit | 474137518a525bb103da1dd33f6afc9167c6fb65 (patch) | |
| tree | aac73be45cc08f272608377e9c0244ac55c4b7bb /tools/aidl/generate_java.cpp | |
| parent | 67f0211bfbc31c2cfb69cd1b38daa7cdb7636c31 (diff) | |
| parent | bb242a7dd978460e34440f2b7b53d1a2051d7ae2 (diff) | |
am bb242a7d: (-s ours) am 7ca0dc50: (-s ours) am 2407ed15: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'bb242a7dd978460e34440f2b7b53d1a2051d7ae2':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions