diff options
| author | Bill Yi <byi@google.com> | 2019-05-20 08:55:16 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-20 08:55:16 -0700 |
| commit | 446dee7ccf4df444f07f140b25c8082f6e893855 (patch) | |
| tree | 0080253b94185a6a4a3684748ba0fe8069f3fa77 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b83dba4a5e4f0e5ec5f3c20729afc44409a0dabb (diff) | |
| parent | a27bce87d450c18ede9bef0200b28ff3b3a1ed46 (diff) | |
Merge "[automerger skipped] Import translations. DO NOT MERGE am: d1ab5aced6 -s ours am: 162dbaa3e4 -s ours am: 166bb0b15e -s ours
am: a27bce87d4 -s ours
am skip reason: subject contains skip directive
Change-Id: Icdc7e76213bfc3c8ab10fd82ca118191489d7dc1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions