| commit | 8a4408ccdf2f2b6720983566725a475b8d99560d | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Thu Oct 11 18:22:51 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 11 18:22:51 2012 -0700 |
| tree | c7c90765df22ebb0ab261768bb7e72e6a6c9702f | |
| parent | 289eb791068d0b10ca07534fdeb97ec84f2f2dc9 [diff] | |
| parent | fdb6be8b1f76caf0f2ba64fb68d5d0b8e33a7a54 [diff] |
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.