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