summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Hao Dong <spdonghao@google.com> 2025-01-09 15:21:02 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2025-01-09 15:21:02 -0800
commit4a7582e6b8786e3f7826ddb403f7bb258ccb9fcd (patch)
treed51feea3481d772eadcf237f79b3cbeb1d8374f8 /libs/androidfw/AssetsProvider.cpp
parent36bc27e4abef8abaf06904d2a542965d87f89b79 (diff)
parentad959e4d9f6a4179db5507c3cd9f8046420dbefd (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: 13844b3080 -s ours am: ad959e4d9f -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: I0debd514f42a97025b883c7d43bc07dfb70d81e2 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