diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-05-17 23:20:31 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-17 23:20:31 +0000 |
commit | 70060539aae86f66a1daf2a5bfaab20f9c36c82c (patch) | |
tree | b6a94ec304ea77c9a170ece46d9d5687d0fc7152 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | e936691bfc133fe98f51e3175f31908a504870de (diff) | |
parent | 6959e2b475c6bb050869f82d290d240c26f1c89a (diff) |
Merge changes from topic "am-4a0c0e3d-b1ad-44cf-9088-b37a160bc2ac" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2 skipped: a492d4d55b
[automerger skipped] Import translations. DO NOT MERGE skipped: 63cef597e2
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions