summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-08-10 20:52:10 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 20:52:10 +0000
commitd8f6ffaa2421eb87de8412ee5f305ff517ce0bb0 (patch)
treeb9f83fd6539f7c746c3d3d0007c45ce90d818272 /libs/androidfw/AssetsProvider.cpp
parent32473449398500d4146c7e8876bcf9ea06bad0f0 (diff)
parentd0824691515833f6a44e0b8309adfabf6c6d072e (diff)
[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 skip reason: skipped by user tjstuart Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19300734 Change-Id: I4ab3091bb0a561d77ca91688ee55eee0e81aeb2f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions