diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-07-06 02:45:57 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-06 02:45:57 +0000 |
commit | c1dc805861bef15447d843737682db50c86fa871 (patch) | |
tree | a27774933a298ff7de0fcb89d544657b51c208c9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | ec4d649d8f34d716b008b7eeafa92953370594b7 (diff) | |
parent | 998f40e6c57dd738ade1980c6c06a6f72879978a (diff) |
Merge changes from topic "am-20b78215-c47d-481a-9e96-79127da1c87c" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec skipped: 8062f299b1
[automerger skipped] Import translations. DO NOT MERGE skipped: 32c08741ec
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions