diff options
| author | 2025-01-09 16:13:39 -0800 | |
|---|---|---|
| committer | 2025-01-09 16:13:39 -0800 | |
| commit | c8ac88d36f0ec52895acea4bd80aa4fbce9343e4 (patch) | |
| tree | d7791152836227257a1508823ca0a1ab63842585 /libs/androidfw/ObbFile.cpp | |
| parent | 131a63aa7eab77f37d96ca1744e73d77285ed7e7 (diff) | |
| parent | 459b028895aec43e494b993dd3632c8a82053592 (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: 4a7582e6b8 -s ours am: 459b028895 -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: Ie923109428553e1db81a9625d6965fe5f7fa0ee5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions