diff options
author | Eric Fischer <enf@google.com> | 2011-05-18 09:21:13 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-05-18 09:21:13 -0700 |
commit | cd4877f0e7b120fac044fa6011856bca31b7507f (patch) | |
tree | 15daedb982dfaa2a0f87152380aec8260a9a8358 /tools/aidl/generate_java.cpp | |
parent | 706804e2e4199a7cfcb7e491d7aca38885ff0f14 (diff) | |
parent | 49ac741841224b9ff2579f6b7722dc7eb0ebcd3a (diff) |
am 49ac7418: (-s ours) am d9703697: am da480945: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '49ac741841224b9ff2579f6b7722dc7eb0ebcd3a':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions