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