diff options
| author | 2023-12-06 22:09:17 +0000 | |
|---|---|---|
| committer | 2023-12-06 22:09:17 +0000 | |
| commit | 6329a2255e0be690683bdea765ca34aa5f514265 (patch) | |
| tree | ff7362f44b886cf0b1209eae9f1a2836a05d8205 /libs/androidfw/StringPool.cpp | |
| parent | 2cc1e7b8faf6446208b0e12f48dc191a4e7d19bc (diff) | |
| parent | f84c8e66390b66a5709fc44244398529b2266d26 (diff) | |
Merge "KeyguardManager: clarify behavior for profile with separate challenge" into main am: aea7009e41 am: f84c8e6639
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2850163
Change-Id: Icacb231df2bb4ff6302c18298455d649d4767bb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions