summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Hao Dong <spdonghao@google.com> 2025-01-16 12:30:32 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-16 12:30:32 -0800
commit83433ed2c02f7a3230bb51b84a31063cf29a32e0 (patch)
tree086b31764cde063ef7bd15ef0fab164f7f2d4acd /libs/androidfw/AssetsProvider.cpp
parent7866918e2cb540d9252b70c37740764e86156575 (diff)
parente8407bd966cf48058065231e7487b40ab3587c79 (diff)
[automerger skipped] Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into sc-dev am: 640a584ebc -s ours am: b2ff727f5e -s ours am: 02bd34ec4f -s ours am: c9bac9e14a -s ours am: 1e680db9a2 -s ours am: 525ca80c89 -s ours am: e8407bd966 -s ours
am skip reason: Merged-In I722e285cd15869799b9fadd2324014cf3c6d44ad with SHA-1 e1c25c186f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28784886 Change-Id: I5d0d750d286666bb33c78835a9f48ba0789397b7 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