diff options
| author | 2025-01-09 14:38:15 -0800 | |
|---|---|---|
| committer | 2025-01-09 14:38:15 -0800 | |
| commit | ad959e4d9f6a4179db5507c3cd9f8046420dbefd (patch) | |
| tree | a399a712e2d5b5d6b204e5b52174bb8826c83d93 /libs/androidfw/AssetsProvider.cpp | |
| parent | 4ec65756dca288c3666eda022066c9c0be004e67 (diff) | |
| parent | 13844b3080c1bc42548c6ecbcfd7380eb87c7da4 (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 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: I367e619d8c5aeb2ee502450ed63820cce0523a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions