diff options
| author | 2023-06-16 15:04:42 +0000 | |
|---|---|---|
| committer | 2023-06-16 15:08:00 +0000 | |
| commit | c6f69560e3fbf1fbc28c80c34c2d6de474d20434 (patch) | |
| tree | 6b9e8a0b24bf1f8d413bb0b8e61894f562fc159a /libs/androidfw/ObbFile.cpp | |
| parent | 52df218366b2be6403478cc0f32aa9fbb0a09ed8 (diff) | |
| parent | 04900eb0fd71263d3eb5ee4a09de81e18aa80ed2 (diff) | |
[conflict] Merge "Add new strings that are shown when the user is asked to enter pin/pattern/password instead of biometrics" into udc-dev am: b96e63953f am: 04900eb0fd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23675968
Change-Id: Iac9265dc3592728993805685280074c47de9ae26
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