diff options
| author | Baligh Uddin <baligh@google.com> | 2013-08-27 17:51:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-27 17:51:09 -0700 |
| commit | 751426eccfcaa874633930d02b94db3e80a1a9e5 (patch) | |
| tree | 2621235eb0d00be5afb91e8659f3a776f8310a07 /tools/aidl/generate_java.cpp | |
| parent | 00bcd87091c2263ef70494a4c1afd74648bd761e (diff) | |
| parent | d0ed585368ccfa2438ffc0fedc9ff48664a2a249 (diff) | |
am d0ed5853: (-s ours) am 397c7aaf: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit 'd0ed585368ccfa2438ffc0fedc9ff48664a2a249':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions