diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2018-07-06 02:45:27 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-07-06 02:45:27 +0000 |
| commit | ec4d649d8f34d716b008b7eeafa92953370594b7 (patch) | |
| tree | a27774933a298ff7de0fcb89d544657b51c208c9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b3bf111bd5044ccf85e6a9a678b13c18037b3e0d (diff) | |
| parent | 9204ce40e4d7b47becb1c2dc61f70ebbb2b7f758 (diff) | |
Merge changes from topic "am-5f59ad6e-1c79-44f8-a437-eac2cc321cdf" into oc-dev
* changes:
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6 skipped: f028c34cdc
[automerger skipped] Import translations. DO NOT MERGE skipped: cd4aea64f6
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions