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