summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-10-28 22:40:07 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-10-28 22:40:07 +0000
commitfbc12e8fd551732f999e74c655447bb4ca724663 (patch)
treef53c03f2419623c91b648d53d0c4fbb1836cb270 /libs/androidfw/AssetsProvider.cpp
parent2f425b99ff6fba02d00b0f80e47918e27cb30da1 (diff)
parenta7e8ba86114be689a46b8d1f9991cdd4e29d3dea (diff)
[automerger skipped] Merge "[DO NOT MERGE] fpService#authWithPrompt uses correct user handle." into sc-dev am: f7d906ad61 am: 7f49832dcf -s ours am: 6fb333236f -s ours am: 2f12a71b13 -s ours am: a7e8ba8611 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19911498 Change-Id: I161dc03f0d909ad3cf27e794426e75b4e00d32e6 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