diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-07-06 02:46:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-06 02:46:51 +0000 |
| commit | 6005492cb2799c2e1b6828d31491b7ca3e2fac0a (patch) | |
| tree | a27774933a298ff7de0fcb89d544657b51c208c9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 37d9749e81e2713112c621321790578b5eb27415 (diff) | |
| parent | 8700285134190dabe3d23696d73b889f37218e06 (diff) | |
Merge changes from topic "am-5c22e81a-5f3d-46c4-9d8f-58c6edfac103" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557 skipped: 4740838b56
[automerger skipped] Import translations. DO NOT MERGE skipped: ff2f705557
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions