summaryrefslogtreecommitdiff
path: root/libs/androidfw/BigBuffer.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 23:53:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 23:53:20 +0000
commit132e4229da63cf667974e2b12ed6240b1ab79bbf (patch)
tree7460340e694daccf4c24d087ca3aae9fc1a94830 /libs/androidfw/BigBuffer.cpp
parenta20e057740c311d895196eaa4daeb4b2710568f3 (diff)
parent1374f7797ef1e258bce50c4f124beba368de3d32 (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: 1374f7797e -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: Ib725397a51a58c48b149f7ae599db64788bad787 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/BigBuffer.cpp')
0 files changed, 0 insertions, 0 deletions