diff options
| author | Bill Yi <byi@google.com> | 2019-05-23 03:19:31 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-23 03:19:31 -0700 |
| commit | e356145fb0e9eb403d383f5c445e2ac8f02065ff (patch) | |
| tree | 2a6f4a0cc03e57fa8e754019e28c18ebc6a7bf10 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fb20fb7d51d745a7b45bbddaa6b1f52b44c48610 (diff) | |
| parent | 8db7bde577a630ef9ed028e2e2d5ce64cadc9f48 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b1aad16b4a -s ours am: 20cf07b649 -s ours am: fad0097ded -s ours
am: 8db7bde577 -s ours
am skip reason: subject contains skip directive
Change-Id: I9e06b70927ac7134c89fcc94e7acc2a13729da52
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions