summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Hao Dong <spdonghao@google.com> 2025-01-09 13:23:19 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-09 13:23:19 -0800
commitcdcaa929495fdd9b86c1c334bc493412b7aad237 (patch)
tree447993a0746cc67bcb4b0c17e7d5b781c4468bf2 /libs/androidfw/AssetsProvider.cpp
parent8c0bf8e8e98cf8dd1fe7f358417f021391fc27d8 (diff)
parent1c010bb73d800824d0bf943c186681a8e8196810 (diff)
[automerger skipped] Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into tm-dev am: 6b22d7cfb9 am: b56873ab74 -s ours am: 1c010bb73d -s ours
am skip reason: Merged-In I722e285cd15869799b9fadd2324014cf3c6d44ad with SHA-1 0842ced90c is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28783068 Change-Id: If727c7c680a7712476668f870ea1454f0d108db8 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