| commit | 09f82ec61cca00bd8b08529a94139dd6ac5cec73 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Fri Dec 11 13:20:15 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 11 13:20:15 2009 -0800 |
| tree | e9673829f98ccefb838029a7d71eb0e9962ec339 | |
| parent | e86a37c6bfb0a0aa9ce871fdfc9e884ab3ddd1d8 [diff] | |
| parent | af1255dab8fa3eab1caf9bae799f80de14a74470 [diff] |
am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2 Merge commit 'af1255dab8fa3eab1caf9bae799f80de14a74470' into eclair-mr2-plus-aosp * commit 'af1255dab8fa3eab1caf9bae799f80de14a74470': Fix #2320798: Device hang then runtime restart