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