diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-03-05 17:57:45 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-03-05 17:57:45 +0000 |
commit | 99cc6cb2a1002bb7d3f52e1f1a9c14429d05c1bf (patch) | |
tree | ac837fe5889484c5ff814e3118bc972859433be5 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | ee97cf22ba1411ac57b31105dd9ac076b33f33f6 (diff) | |
parent | 4532cd3395469a7c1b4d114dd487e1b11b53fcfa (diff) |
Merge changes from topic "am-d9c6be77-633d-4f98-8eb7-b9106af9ba0f" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: c9f5891a7f skipped: 0a1d5cc852
[automerger skipped] Import translations. DO NOT MERGE skipped: c9f5891a7f
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions