diff options
| author | 2025-01-16 13:35:24 -0800 | |
|---|---|---|
| committer | 2025-01-16 13:35:24 -0800 | |
| commit | ea8e341c76798aaa7ce624c55dd01a144530707b (patch) | |
| tree | bac95dc0d0989cc525ce9593b0d6d8276a6cd1c1 /libs/androidfw/FileStream.cpp | |
| parent | 80cf95ce9e0ea6d68494c5aac5ea957136004f1c (diff) | |
| parent | c5283007e9b40874f0e498f81c4ee66e1c226d48 (diff) | |
[automerger skipped] Merge "Fix settings activity showing background bp when createConfirmDeviceCredentialIntent() API is used." into sc-v2-dev am: 40d8b4cfae -s ours am: 475a4237d7 -s ours am: 25b22bf065 -s ours am: 84305f46b9 -s ours am: 0aa1042cea -s ours am: bdd8ca7abc -s ours am: c5283007e9 -s ours
am skip reason: Merged-In I722e285cd15869799b9fadd2324014cf3c6d44ad with SHA-1 231bda4521 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/29913418
Change-Id: Ida9853bed9e9111b041d1d99bc78c91a5eb90ce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions