diff options
| author | 2023-06-27 09:14:22 +0000 | |
|---|---|---|
| committer | 2023-06-27 10:04:07 +0000 | |
| commit | 77fa67e4248fa9609e9446e051a0f403e9cae8f5 (patch) | |
| tree | 8ac661dacb50eb358769995914334a60adace7bb /libs/androidfw/StringPool.cpp | |
| parent | b2112cc73c4be02eab8f4935734a62392d052de6 (diff) | |
| parent | 68c74f4c51f3d630b1f1d5293603a006c7911ca2 (diff) | |
[conflict] Merge "Respect always unlocked displays when keyguard is shown." into udc-dev am: 68c74f4c51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23692527
Change-Id: Ib906a8dd6f20de3f80248f8225e5e7f9c460cf61
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