summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Thomas Stuart <tjstuart@google.com> 2022-08-10 21:57:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 21:57:00 +0000
commit31a632835d6f30a8beaa195a02322ce095ce0d57 (patch)
tree6c18b69e8c6a376f3c6861db3400df42feec3fb6 /libs/androidfw/StringPool.cpp
parentd740279cdf94df417ee184379c3a1bf69db47409 (diff)
parent36f6dd18e37d2ffede2430c50cd7ab3a8116c6fe (diff)
[automerger skipped] Merge "switch TelecomManager List getters to ParceledListSlice" into rvc-dev am: 2f287743a4 am: b680cef434 -s ours am: 3247344939 -s ours am: 1ef8802d73 -s ours am: 36f6dd18e3 -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: I30d00789157a17045c41cdd42bdd752451c98bcd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions