diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-11 18:19:38 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-11 18:19:38 +0000 |
| commit | c70d882667fd0cb6ce283fcaef84d8a545a6be85 (patch) | |
| tree | d3581ecd99795b9f13256fb98048409766275feb /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 836d1db23982975f7850abd944ae59b1af0b7393 (diff) | |
| parent | b1615a6d905c56052c5ad868e39f97a2680f76d9 (diff) | |
Merge changes from topic "am-8bf63f1b-ab99-4537-ad90-d648a4dd77b0" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58 skipped: cc2c91ba39
[automerger skipped] Import translations. DO NOT MERGE skipped: 9f043e5e58
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions