diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-11-11 03:26:32 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-11-11 03:26:32 +0000 |
commit | cff099466e15ef1dcfeb77a756b6852af5e37f0c (patch) | |
tree | 05c3f64527833b5b61c5c8f6212b5123a31aded7 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | cfbf7a21c3e534702e780d44159a2d8c7a8a2c10 (diff) | |
parent | 5e3def3f70feb60c559d25dd0e411b081671ebbc (diff) |
Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807
[automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions