diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-10-01 05:44:56 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-10-01 05:44:56 +0000 |
commit | 57b2e38837699ba44275e534add6d3bf8088b963 (patch) | |
tree | 63089d693436e38af49066f5bc1fd5fc972eea54 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 33be0d800af582df986ebfa84e2c30e9bd623fb7 (diff) | |
parent | 0bc949205bfffe148ab5e7005c1016308b3dca9f (diff) |
Merge changes from topic "am-59fcdedb-d1d8-4894-bcee-75f4085aa930" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520 skipped: 853c7ca3a5
[automerger skipped] Import translations. DO NOT MERGE skipped: f4b2cb1520
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions