diff options
| author | Geoff Mendal <mendal@google.com> | 2015-08-01 17:55:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-01 17:55:36 +0000 |
| commit | 9f2cddbbaf7a16d4de2988dc07489113a030ac11 (patch) | |
| tree | 3261aea381da3a870a9801bfdc9f3e38b10b1acb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 939423cb380344e41b422b1ed227541f2dee713f (diff) | |
| parent | fd5a2c268933337a0028a8c6a3a76394f7dba441 (diff) | |
am fd5a2c26: (-s ours) am 6afc3982: (-s ours) am 9bc4bdea: (-s ours) am 1491492a: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'fd5a2c268933337a0028a8c6a3a76394f7dba441':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions