diff options
| author | 2022-08-10 23:11:39 +0000 | |
|---|---|---|
| committer | 2022-08-10 23:11:39 +0000 | |
| commit | 1374f7797ef1e258bce50c4f124beba368de3d32 (patch) | |
| tree | a46c46e7fc8f557bcc3b47e4dc1a6cb056c9c262 /tools/aapt2/ResourceTable.cpp | |
| parent | 2dce3bcf5b38975217dd9ec3ef45702a8a86b42d (diff) | |
| parent | f0d1aa1966d6e91fcf98cee2c7c43cd658094dfd (diff) | |
Merge "[automerger skipped] Merge "switch TelecomManager List getters to ParceledListSlice" into qt-dev am: 8f07d18092 am: 3ff00b522f -s ours am: 276cf3586d -s ours am: d082469151 -s ours am: d8f6ffaa24 -s ours am: 4353d020a5 -s ours am: 94a0b6b593 -s ours am: 9c162c78d6 -s ours am: c0b58c4bbf -s ours" into tm-d1-dev-plus-aosp am: f0d1aa1966 -s ours
am skip reason: Merged-In I025245b2a6f8cfaca86f268851a9d8f0817e07dd with SHA-1 f5ab5186da is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19300734
Change-Id: I74266c9f0cbb51f628d09bf7efe8bfa94246889c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'tools/aapt2/ResourceTable.cpp')
0 files changed, 0 insertions, 0 deletions