summaryrefslogtreecommitdiff
path: root/tools/aapt2/ResourceTable.cpp
diff options
context:
space:
mode:
author Thomas Stuart <tjstuart@google.com> 2022-08-10 23:02:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 23:02:46 +0000
commitf6508b83b9be57e1b6cf6efc687baaa8929787c1 (patch)
treea10062b0a6ed6cbb93e58288d970b5eaf813e50c /tools/aapt2/ResourceTable.cpp
parent6bd66cba806eba5a2437517f41018648c928f324 (diff)
parent15a817440f5c665d5e436880691f535c173e1f74 (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: 15a817440f -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: If61e6bb202ceaa243234e41d3a1b0227a58e3467 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