Commits
Patrick Brady authored and Android Git Automerger committed d16dedf3055M
am 67ebb2f8: am 957b27f6: Merge "Revert "Always show emergency button on selector view screen in keyguard." I\'m reverting for now while we sort out the actual requirements. Sorry for the thrash, Jaggies. I\'ll handle re-adding it if needed." into jb-mr1-dev * commit '67ebb2f8512bbf9ecceb2c1570bcc38487f35b1e': Revert "Always show emergency button on selector view screen in keyguard." I'm reverting for now while we sort out the actual requirements. Sorry for the thrash, Jaggies. I'll handle re-adding it if needed.
Showing diff to069b87cf1f0