diff options
| author | 2025-01-16 11:39:35 -0800 | |
|---|---|---|
| committer | 2025-01-16 11:39:35 -0800 | |
| commit | 84305f46b9db6767a5a580c3a5e452af29d64aa7 (patch) | |
| tree | 15a8de65d61f3fab287f3d82e63b4fc6b1335202 /libs/androidfw/FileStream.cpp | |
| parent | 35ce5c3ce699ca82cac898339dff8d964aaee48d (diff) | |
| parent | 25b22bf0650931f2e1eee4f295ed3a50bfd1f675 (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 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: I7fb9fb4998cb7fa4a32637df828b224c254a3708
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