| commit | a612fad1f18fb9f4f8f5258faa0ccfc4d9ec1788 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Mar 20 16:46:06 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 20 16:46:06 2012 -0700 |
| tree | 4e8ab5a2d85f441fab326fb5673ba442262e5200 | |
| parent | d5b5db73fcb49a4ca04e9cefc5f5293faba5895e [diff] | |
| parent | 890266fa5702292517774ca2aa56a410df535b28 [diff] |
am 890266fa: am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen * commit '890266fa5702292517774ca2aa56a410df535b28':