summaryrefslogtreecommitdiff
path: root/libs/androidfw/Util.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 01:02:26 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-08-10 01:02:26 +0000
commitc42351eb4cc34d0810c7390b878b5ff92bbd7c25 (patch)
treedf1897696fbf8b61c0f2a5bd00f8e45203e76038 /libs/androidfw/Util.cpp
parent9e2522c54cd9f631c9bdf78f0238c90b7e59d447 (diff)
parent80d445741f99cda7bb55deb55018d1c054c67c1a (diff)
Merge changes from topic "am-011deab34d514b939715ba9a508e18d9" into tm-qpr-dev-plus-aosp
* changes: [automerger skipped] Merge changes from topic "cherrypick-TelecomSwitchToParceledListSlice-4t4tlydm2u" into sc-mainline-prod am: 2b01f3d22a -s ours am: 408d23121c -s ours am: d33e559674 -s ours am: 3e2c0d1bf1 -s ours [automerger skipped] [automerge] switch TelecomManager List getters to ParceledListSlice 2p: d54a48f42a am: b8de3562fa -s ours am: 7bfe5e24c0 -s ours am: b20a353df6 -s ours am: 1cf3daef99 -s ours
Diffstat (limited to 'libs/androidfw/Util.cpp')
0 files changed, 0 insertions, 0 deletions