diff options
| author | 2025-01-16 13:39:24 -0800 | |
|---|---|---|
| committer | 2025-01-16 13:39:24 -0800 | |
| commit | 6ce28c053040628dd292c9dcdcf539bc3dfec58c (patch) | |
| tree | 7bc778f3f6028fa5a9c6cabaf07207f10f366745 /libs/androidfw/FileStream.cpp | |
| parent | 2048e1f834e8d2fb8240a866bada68b0dbedef1a (diff) | |
| parent | 4bb6a431694cadea3a396dfa40dfd9ae648b0c5f (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: 299179256b -s ours am: b0153bc815 -s ours am: b29d4a7d9e -s ours am: 13a3834ef7 -s ours am: 4bb6a43169 -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: Ifbb937aa310be9ea09fe6df899a960f435f61856
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