| commit | bcd5944578ee3c8803243ed60334f817968fe603 | [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 | 0da87ace16edf4a3b992ca9a9934d34b73450ebd | |
| parent | c5c49398584f2399af905a931e556ed6e0a29cd4 [diff] | |
| parent | 0ff7b8ee7f619f54464d5d3002769c746f6062a9 [diff] |
am a4a09465: am 35a8f94d: Reconcile with ics-mr1-release * commit 'a4a09465569d0f4cce36f089fa02d5ef9b95db81': Fix 5960562: Show emergency button on PukUnlock screen