| commit | 04522430d353ab1555cb4c0c1479e2c045135163 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Fri Oct 12 11:09:43 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 12 11:09:43 2012 -0700 |
| tree | 34070c53535cc01bc4ad6303b144a1100c18238e | |
| parent | 260d1f274801cd8bf0b925a62443a6a261c9b18b [diff] | |
| parent | 855cd7763aff75387777701559dea91968321841 [diff] |
am 855cd776: am 8a4408cc: am fdb6be8b: Merge "Always show emergency button on selector view screen in keyguard." into jb-mr1-dev * commit '855cd7763aff75387777701559dea91968321841': Always show emergency button on selector view screen in keyguard.