diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-12 23:12:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-12 23:12:09 +0000 |
| commit | 8a8d800fba42746b57a613d4118348f83175c447 (patch) | |
| tree | 2b0443778f446ed62174af3633d69cf14fe3e540 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fcbf8705e375d0e1d54b7d6da639ec3453aefe68 (diff) | |
| parent | 682cec120ee73d8e831e4d04c478712dc408cf02 (diff) | |
am 682cec12: (-s ours) am 39b03e76: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '682cec120ee73d8e831e4d04c478712dc408cf02':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions