diff options
| author | Justin Ho <justinho@google.com> | 2012-02-10 10:13:19 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-10 10:13:19 -0800 |
| commit | f994f353f705dc69c1e57bd6785092218fd630d2 (patch) | |
| tree | 190cbe0fd993f9fb085c02f4e52d7520918df1de /tools/aidl/generate_java.h | |
| parent | b45087bf09921dd515e83804d821f127d8b790c6 (diff) | |
| parent | 448249d1a7e0b871b9a9db49a45e0e51f6d36d65 (diff) | |
am 448249d1: (-s ours) am 744c5b0b: Merge "Import translations. DO NOT MERGE" into ics-mr1
* commit '448249d1a7e0b871b9a9db49a45e0e51f6d36d65':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aidl/generate_java.h')
0 files changed, 0 insertions, 0 deletions