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