diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-07-06 02:55:05 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-06 02:55:05 +0000 |
commit | cec93100ead6e9f2dcdc60237d53dfc10f6c2936 (patch) | |
tree | a27774933a298ff7de0fcb89d544657b51c208c9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 72e16b1754a1c832bdf35abeb7abc36af7e02d95 (diff) | |
parent | c6d9bee144e9d40fc8453633bfdf58d49261f145 (diff) |
Merge changes from topic "am-59bde7f2-9903-448c-9ad1-8364ed396cf3" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e skipped: 33cf864720
[automerger skipped] Import translations. DO NOT MERGE skipped: c28b092c5e
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions