diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-26 16:59:48 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-26 16:59:48 +0000 |
| commit | 663d35d9e6d151f969712acfe9e9ce9f7b526a27 (patch) | |
| tree | caae946d75f12a6460f406f34b7091ddbbb77ad7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 030f554670064e52622e2bd1b980c569bcf533b5 (diff) | |
| parent | 788ce00db578979ff7e9099d18564e0a9d2e5a4d (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 128ad1be22 -s ours am: 788ce00db5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12456710
Change-Id: Ib025fd6a894493abefd6d9a53ad53bd8c161aa91
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions