diff options
author | Baligh Uddin <baligh@google.com> | 2012-11-07 11:42:46 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-07 11:42:46 -0800 |
commit | db60b67533f0e8e0366a926204bc852412285320 (patch) | |
tree | 75733488a1ba55b7fc1b4de4d07954ef71c9f906 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 506fd3b02ef4b036aceb66db76ca93c55254bfcf (diff) | |
parent | fc958f12f639a6a9cb676b0d1e30ed67b4f5a455 (diff) |
am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit 'fc958f12f639a6a9cb676b0d1e30ed67b4f5a455':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions