diff options
| author | 2025-01-10 10:26:13 -0800 | |
|---|---|---|
| committer | 2025-01-10 10:26:13 -0800 | |
| commit | b1767917b549118cd467118f862eb4a3cfd5929d (patch) | |
| tree | 6ba1658b536748ac67da7c9a2524606c47debe96 /libs/androidfw/FileStream.cpp | |
| parent | 567986b175f476cd998f1470fd9113ad58ac1a08 (diff) | |
| parent | f7284a4a6202146a776acd6272af017268b70d5b (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: 5313d7bed4 -s ours am: bd263ac176 -s ours am: f7284a4a62 -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: I6f5565ebef0060f177406641a1bcfa170de8e9ac
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