tree b1c9664b8595030ffb62822343a4c561cd6d776f
parent a1ecd5a30cd7f93beed0943ff403227d04d9b34c
parent b6a1ea78b8c9e2c13d8fefad37c27f04bdca107c
author Patrick Brady <pbrady@google.com> 1350021874 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1350021874 -0700

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