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