| commit | 1ea1cadadc7a8186568c261584886ad7fef1171e | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Mon May 21 14:28:52 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon May 21 14:28:52 2012 -0700 |
| tree | de1d2418761cab340faded8e79a0180407498a43 | |
| parent | 193c30d055a46e0adf14bf619ca527a429d78c33 [diff] | |
| parent | 0f5ed90fa36c5f9aa7732f776bb52ebda2734d93 [diff] |
am aaaeabd6: Reconcile with jb-release nakasi-factoryrom-release * commit 'aaaeabd6a655068605747ad492ddb0ee128d1c36': Fix a NPE found by Moneky. Fix a dead lock while we freeze the screen. Restore deleted string still referenced from menu resource.