| commit | 0ff7b8ee7f619f54464d5d3002769c746f6062a9 | [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 | c33b192e00e226495066be24aa9df36212378d72 | |
| parent | da394bb36de36c52db24fe6b6250d1c623aa5626 [diff] | |
| parent | b6bf4cc62db7835fcdaa6243d5bf975a18a4fcd1 [diff] |
am 35a8f94d: Reconcile with ics-mr1-release * commit '35a8f94da6a8a3a6757e5663bfcbcd044f72a92a': Fix 5960562: Show emergency button on PukUnlock screen