diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 15:46:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 15:46:47 +0000 |
| commit | 40f2f52140a3e434a4cd9e53455fd99406af3ac9 (patch) | |
| tree | 7f69384acaac3e5b33676fa3a0f5529b3a041e80 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | c5d5494f3f45c754ba6a2eda6bd6c9965abfcb1a (diff) | |
| parent | 61cbe6cc40f26833237ce487336b41ae8688a026 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: f6d4adeef4 -s ours am: 75f9d330db -s ours" into rvc-d1-dev-plus-aosp am: 3f99ca4f24 -s ours am: 61cbe6cc40 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12187283
Change-Id: I2bd2a5b1792262431a13f4571d7e2d241816f598
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions