diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-11-11 01:38:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-11 01:38:13 +0000 |
commit | cfbf7a21c3e534702e780d44159a2d8c7a8a2c10 (patch) | |
tree | 05c3f64527833b5b61c5c8f6212b5123a31aded7 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 8c5514b186f0da778277c33415c658687b665fa4 (diff) | |
parent | 39a2390fb91e78b39817aa0f159943d3e45d40ca (diff) |
Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a
[automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions