diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-05 21:43:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-05 21:43:10 +0000 |
| commit | 0eba71934849b0021c14378cab4c20d316e8aa3e (patch) | |
| tree | 49036e1132f5a005f74cc468aee9b83ad90ba435 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 50408197e9cc76faeb4cf4d627d64809b1ad6ea0 (diff) | |
| parent | 1e7fbc3a01d08aaef6b9ca958f6a59672cc2e4e1 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 97455bb190 -s ours am: f8c9fc05fc -s ours am: 90c00b9586 -s ours am: 195fb55d9b -s ours am: 1e7fbc3a01 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12077356
Change-Id: If72da5bada1f09d9968f851f3f3bd72d56520e7f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions