diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-06-11 18:06:41 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-06-11 18:06:41 +0000 |
commit | 3bbe3c7c93814bbbb9f2bf10014a3f1e4b3c185f (patch) | |
tree | d3581ecd99795b9f13256fb98048409766275feb /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | bd9caf4c6f257bea7a5b4e5bb0d2ffa23c830799 (diff) | |
parent | 71f5cfa65072102b75846e1cf7777251ce377552 (diff) |
Merge changes from topic "am-63639373-f180-4cce-87e9-95ef192ab9ec" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42 skipped: 3c2edd55ce
[automerger skipped] Import translations. DO NOT MERGE skipped: 0be149db42
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions