diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-14 07:06:18 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-14 07:06:18 +0000 |
| commit | 4edbbbfce3bf9bf00c56b64d268570859003793d (patch) | |
| tree | a9e0e5c34fc13bdb78058927ec24249545b8a06a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 830259fa11ea8295710dd70e3f6320745d362340 (diff) | |
| parent | 5db80c078aacb2afedce00f6dc0a7d001b7309a3 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 1e5e8ecad1 -s ours am: f7fa1d8d26 -s ours am: 5b283f1285 -s ours am: 5db80c078a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11860338
Change-Id: I9bc057660a007bce3528806a97a5fd2cc71b3824
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions