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