diff options
| author | Baligh Uddin <baligh@google.com> | 2012-11-02 09:16:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-02 09:16:37 -0700 |
| commit | fb218285b90ec533acfc934ca4d181c15755355d (patch) | |
| tree | c5c319b5a50a3840810445386eb2c9f88f5b9c77 /tools/aidl/generate_java.cpp | |
| parent | feb4ba41997d8b6d759b120c95169f73bb5de0a9 (diff) | |
| parent | 3cdcd8f514afe9cca6fd166884797841c4c87b36 (diff) | |
am 3cdcd8f5: (-s ours) am 19e98ea1: am 37238e5a: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '3cdcd8f514afe9cca6fd166884797841c4c87b36':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions