diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-02-20 04:54:20 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-02-20 04:54:20 +0000 |
| commit | a1f536e00e6f7ccbca1654104dc49cc501f9be2f (patch) | |
| tree | ac837fe5889484c5ff814e3118bc972859433be5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | dd05e2d93233548759b3f603a275f149820eeff6 (diff) | |
| parent | 7b73069b0a857faf2c326297f7c7fb80e29308cb (diff) | |
Merge changes from topic "am-b69199ef-52eb-434d-a231-8cb19da641fc" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2 skipped: 2aaa34b639
[automerger skipped] Import translations. DO NOT MERGE skipped: 4c87ffeae2
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions