diff options
| author | Geoff Mendal <mendal@google.com> | 2014-10-09 13:03:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-09 13:03:02 +0000 |
| commit | 437e5c9c9a994efe795e72ffe4721055f077c4cf (patch) | |
| tree | 56822cf1b6a1aa63fb9f9341e0992da7fef11469 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 301d2276f9d5208da7036b465203575a5eac8936 (diff) | |
| parent | db5b94d4050c169cf1c41aca8af83b1c0225c037 (diff) | |
am db5b94d4: (-s ours) am f121892b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'db5b94d4050c169cf1c41aca8af83b1c0225c037':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions