summaryrefslogtreecommitdiffstats
path: root/packages/WAPPushManager/src
diff options
context:
space:
mode:
authorPatrick Brady <pbrady@google.com>2012-10-11 23:04:34 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-10-11 23:04:34 -0700
commit957b27f62b5dd439c71ab8e2c0e46313ea89d4e8 (patch)
treeb1c9664b8595030ffb62822343a4c561cd6d776f /packages/WAPPushManager/src
parenta1ecd5a30cd7f93beed0943ff403227d04d9b34c (diff)
parentb6a1ea78b8c9e2c13d8fefad37c27f04bdca107c (diff)
downloadframeworks_base-957b27f62b5dd439c71ab8e2c0e46313ea89d4e8.zip
frameworks_base-957b27f62b5dd439c71ab8e2c0e46313ea89d4e8.tar.gz
frameworks_base-957b27f62b5dd439c71ab8e2c0e46313ea89d4e8.tar.bz2
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
Diffstat (limited to 'packages/WAPPushManager/src')
0 files changed, 0 insertions, 0 deletions