diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-10 18:23:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-10 18:23:23 +0000 |
| commit | 608f228933c00d122a3fb32bf02f3a80ac364dfc (patch) | |
| tree | b8dcd7648281d6eb09d2957516052f61de946f39 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e869b3981506537dabbd1011df94f1e69ce84495 (diff) | |
| parent | 31a0f46f5feb8aab38cc46cc2a8d48c080a3fd96 (diff) | |
am 31a0f46f: (-s ours) am 3ea5cfa8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '31a0f46f5feb8aab38cc46cc2a8d48c080a3fd96':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions