summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceTable.cpp
diff options
context:
space:
mode:
author Thomas Stuart <tjstuart@google.com> 2022-08-10 23:02:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 23:02:41 +0000
commit34810ab267d9803f232e93ab46db57283c4f6579 (patch)
treea77d47fbd15130b9bc3c4f7df8a5ab5ae16afe10 /tools/aapt2/ResourceTable.cpp
parent1b9cdb02a56f5a33ad7cf748916b6fe17296c352 (diff)
parent4c07a1ed6915d1868d86e289580bc820379e99be (diff)
[automerger skipped] Merge "switch TelecomManager List getters to ParceledListSlice" into rvc-dev am: 2f287743a4 am: b680cef434 -s ours am: 3247344939 -s ours am: 8ea4a4a2c2 -s ours am: 439d5896b7 -s ours am: 8bee45d9c5 -s ours am: 4c07a1ed69 -s ours
am skip reason: Merged-In I025245b2a6f8cfaca86f268851a9d8f0817e07dd with SHA-1 d54a48f42a is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19322229 Change-Id: I2d72665cee3ec4cd4ea5694c8d3b35cb8779928f 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