Commits
Jim Miller authored and Android Git Automerger committed 04522430d35M
am 855cd776: am 8a4408cc: am fdb6be8b: Merge "Always show emergency button on selector view screen in keyguard." into jb-mr1-dev * commit '855cd7763aff75387777701559dea91968321841': Always show emergency button on selector view screen in keyguard.
Showing diff to260d1f27480