[automerger skipped] Merge "Respect always unlocked displays when keyguard is shown." into udc-dev am: 68c74f4c51 am: aa874d6ca2 -s ours
am skip reason: skipped by user vladokom Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23692527 Change-Id: I9514de7291c000c09975f5ad0ea0f099b641fa6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
ce823a8e04