diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 18:31:27 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-24 18:31:27 +0000 |
| commit | 64a0a228f57fdec8aa5c05d18f3df4e0b58b8e5a (patch) | |
| tree | bd44bbbf8dd45b9b5810c6f270906850080efa3a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 5db9f63bb74d4cbc5b1080ed080cf8552a1b4209 (diff) | |
| parent | 82e5c5d78e98e9498075e37e68552ebd6ce08c3e (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 2a35e0e321 -s ours am: 4e28a11a02 -s ours" into rvc-qpr-dev-plus-aosp am: 82e5c5d78e -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11983878
Change-Id: Iae227f417b82f75a61552422e5e038b11fb62122
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions