diff options
| author | Baligh Uddin <baligh@google.com> | 2012-10-31 10:25:36 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-31 10:25:36 -0700 |
| commit | 887b9fe29f282160dd469c7fa0a3e73caefc1c6d (patch) | |
| tree | b1911d727f10022fcdd14bcd4a96fe983ea16bbd /tools/aidl/generate_java.cpp | |
| parent | d1a753cefeaa4d987df8bdeffe5dceb3678b0405 (diff) | |
| parent | 4137ff1c0341e1820528c1ef89ff6104a863de20 (diff) | |
am 4137ff1c: (-s ours) am 8339bf19: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
* commit '4137ff1c0341e1820528c1ef89ff6104a863de20':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions