diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-26 18:44:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 18:44:30 +0000 |
| commit | 20dd965559e535271866dde7a682733bde7749b9 (patch) | |
| tree | 9fe1b54e6921f3d7d55a06478f17dd49e9e08d94 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2bf691436b828b2a71d3d9dc917a3b43adfed73d (diff) | |
| parent | 9641feee025cfd669cd4730bb0609ba16aaffc2a (diff) | |
am 9641feee: (-s ours) am 38499cf8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '9641feee025cfd669cd4730bb0609ba16aaffc2a':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions