| commit | 959fd880eaabcbc2b1fd586e9eb26494eb6b19b1 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 21 08:29:33 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 21 08:29:33 2012 -0700 |
| tree | f6b00c67761e75697851f8f86e37b46da80859cd | |
| parent | 4351d4aa8ebf7e067bb245ef42fc0b3ac0b3d2fa [diff] | |
| parent | a4a09465569d0f4cce36f089fa02d5ef9b95db81 [diff] |
am a4a09465: am 35a8f94d: Reconcile with ics-mr1-release * commit 'a4a09465569d0f4cce36f089fa02d5ef9b95db81': Fix 5960562: Show emergency button on PukUnlock screen