Skip to content
Commit 46b29daa authored by Jeffrey Carlyle's avatar Jeffrey Carlyle Committed by Automerger Merge Worker
Browse files

[automerger skipped] Merge "allow KeyguardIndicationController to be more... 

[automerger skipped] Merge "allow KeyguardIndicationController to be more easily overriden" into rvc-qpr-dev am: b1012032 am: 8c2b879a -s ours

am skip reason: Change-Id Iccbeaa527014abc00107ea1165f93330d80c3791 with SHA-1 1463e18d is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12153272

Change-Id: I0be4ce594309865545dd53f3a20a6b80d7b3c180
parents afc4ef7c 8c2b879a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment