diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-10-01 05:43:47 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-10-01 05:43:47 +0000 |
commit | 33be0d800af582df986ebfa84e2c30e9bd623fb7 (patch) | |
tree | 63089d693436e38af49066f5bc1fd5fc972eea54 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | eb92e99a064d3b82f23d02977910212a84e4191e (diff) | |
parent | fd474f8dc8ae0cbc936a32f52a63deacc7efcf7d (diff) |
Merge changes from topic "am-51a4d236-f631-4fe1-9fa8-50a6c5132ce4" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8 skipped: b5f88962d5
[automerger skipped] Import translations. DO NOT MERGE skipped: 73a5116af8
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions