summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Hao Dong <spdonghao@google.com> 2025-01-09 13:22:54 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-09 13:22:54 -0800
commit8c0bf8e8e98cf8dd1fe7f358417f021391fc27d8 (patch)
tree447993a0746cc67bcb4b0c17e7d5b781c4468bf2 /libs/androidfw/AssetsProvider.cpp
parentd8fe311fb8a820f90df4c69efd561c9d5ae9b64a (diff)
parent57effcaca01f06fd32a79509c003b33cb4a3cc26 (diff)
[automerger skipped] Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into tm-qpr-dev am: c8aa782bae -s ours am: 57effcaca0 -s ours
am skip reason: Merged-In I722e285cd15869799b9fadd2324014cf3c6d44ad with SHA-1 0d67fca4ce is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29915167 Change-Id: I5e6066d18db545732d902f80a199d4a0a5856f51 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