diff options
author | Eric Fischer <enf@google.com> | 2011-06-02 03:21:06 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-02 03:21:06 -0700 |
commit | 279ad356fe965bb867980c00a58d482ba6f747e1 (patch) | |
tree | 67749a5488636b0f78c34cc9e877d878b199d035 /tools/aidl/generate_java.cpp | |
parent | 368f2bd054f63422275072c308cfd6c17d51cd84 (diff) | |
parent | 0bb63c58a464e7df60de103319204b7b590e5d75 (diff) |
am 0bb63c58: (-s ours) am 90856661: am 66fd9ab2: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '0bb63c58a464e7df60de103319204b7b590e5d75':
Import revised translations. DO NOT MERGE
Diffstat (limited to 'tools/aidl/generate_java.cpp')
0 files changed, 0 insertions, 0 deletions