summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Hao Dong <spdonghao@google.com> 2025-01-09 12:47:55 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-09 12:47:55 -0800
commit299179256bcf85d8e8d9997983f31183be627f07 (patch)
tree3cba03cf876c3d0d6ec18d79b6d1dcf2baaee758 /libs/androidfw/AssetsProvider.cpp
parent4ca4ae7174d7c1062fe57fc964612b442bad2322 (diff)
parent4c324b7937fafaf980975999224e3e80bbc11229 (diff)
[automerger skipped] Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into sc-qpr1-dev am: 6f2bb1202d -s ours am: 9483dde567 -s ours am: 4c324b7937 -s ours
am skip reason: Merged-In I722e285cd15869799b9fadd2324014cf3c6d44ad with SHA-1 5ce5bdd539 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29913473 Change-Id: I8afe58b0e5969a113986b5ffbe933f3f0171e773 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