| commit | cdbf566770c964873babae049314f8aaec1969b5 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Tue Mar 20 19:36:35 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Mar 20 19:36:35 2012 -0700 |
| tree | 14f687215313602e98c96b9a949bb79627d902d0 | |
| parent | d16a4f29672d7c9ea2ea802ec9c804563bcb2ccb [diff] | |
| parent | a612fad1f18fb9f4f8f5258faa0ccfc4d9ec1788 [diff] |
am a612fad1: am 890266fa: am 928d3470: Fix 5960562: Show emergency button on PukUnlock screen * commit 'a612fad1f18fb9f4f8f5258faa0ccfc4d9ec1788':