diff options
| author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 19:51:38 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 19:51:38 +0000 |
| commit | eaca91a0acdb92b364453f57b1c4fa82066063a4 (patch) | |
| tree | 09b5e899e63f98928b1de4da01c063fc335f7996 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 0adb9ed5deb68eca70bc4c7b27eb69ac391d48d3 (diff) | |
| parent | 78c13045f07d221f22c56710ebd72b85c0be6841 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: b15b8399e4 -s ours am: fdb56d01b5 -s ours" into rvc-qpr-dev-plus-aosp am: 78c13045f0 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12188734
Change-Id: Ib91c42e69c1b7c0ee71d124343e405091aa40cc9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions