| commit | a4a09465569d0f4cce36f089fa02d5ef9b95db81 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Wed Mar 21 08:26:56 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 21 08:26:56 2012 -0700 |
| tree | 4e8ab5a2d85f441fab326fb5673ba442262e5200 | |
| parent | a612fad1f18fb9f4f8f5258faa0ccfc4d9ec1788 [diff] | |
| parent | 35a8f94da6a8a3a6757e5663bfcbcd044f72a92a [diff] |
am 35a8f94d: Reconcile with ics-mr1-release * commit '35a8f94da6a8a3a6757e5663bfcbcd044f72a92a': Fix 5960562: Show emergency button on PukUnlock screen