diff options
| author | Baligh Uddin <baligh@google.com> | 2013-08-27 17:51:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-27 17:51:16 -0700 |
| commit | 022e26832ab9c2a0f44038aaac3be540401e571b (patch) | |
| tree | 2621235eb0d00be5afb91e8659f3a776f8310a07 /tools/aidl/generate_java.cpp | |
| parent | e59a75eb3867ba47b95179996ea52b46a848ab3a (diff) | |
| parent | 22636af2eec3ea62647ff752d0db456cbbf8e440 (diff) | |
am 22636af2: (-s ours) am ef800067: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '22636af2eec3ea62647ff752d0db456cbbf8e440':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions