diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-16 13:22:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-16 13:22:28 +0000 |
| commit | a41378ac27b28126201b71d314ac480e17b9b9de (patch) | |
| tree | 60898b90cdbe558feee90831b37d9e668827c3fd /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 19f65359b90d2a69b044936b81f4fd4a3d6aa32e (diff) | |
| parent | c64f5ca02b16ebece40c21f401f75c7ace8178ac (diff) | |
am c64f5ca0: (-s ours) am 0134869b: (-s ours) am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit 'c64f5ca02b16ebece40c21f401f75c7ace8178ac':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions