diff options
| author | 2024-01-27 02:47:10 +0000 | |
|---|---|---|
| committer | 2024-01-27 02:47:10 +0000 | |
| commit | d0ad7e97e7453975c6bfb35d022a6149c23f1a78 (patch) | |
| tree | 2c7c6f323f88dfdc9dfe99f21fbf743a86cd245e /libs/androidfw/StringPool.cpp | |
| parent | f755d66b97b028ca8b03d093ab649f38afb006dd (diff) | |
| parent | 657edb98064602d14e8ad2f2312d8ebeaca7f24b (diff) | |
[automerger skipped] Merge "isUserInLockDown can be true when there are other strong auth requirements" into rvc-dev am: 19075fd670 am: 976d59d1f9 am: 3201f76202 am: 8831b577c6 am: c8b6efab58 -s ours am: eee89b5a9f -s ours am: 0ec4ce1971 -s ours am: 36de1cab14 -s ours am: 7945a6e679 -s ours am: 0075bc7fc5 -s ours am: 657edb9806 -s ours
am skip reason: Merged-In I5e979a7822dd7254b4579ab28ecf96df1db44179 with SHA-1 ba8dfc68aa is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/25948484
Change-Id: I215a8947351c94da8244f2f36df465a7592ad1b5
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