| commit | 8badc8e2a5bfadc591dc9f186dc88d94d9d89a95 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Fri Dec 11 13:26:05 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 11 13:26:05 2009 -0800 |
| tree | 1d442662ef9e1e981dd18e687505d0063a3ecd50 | |
| parent | c2833b53e311ef897dcb5b0bd6c03f4cbc3d415c [diff] | |
| parent | fd47cf27bf946ca5cd18cd94f28d6b9f61b07b2f [diff] |
am 09f82ec6: am af1255da: resolved conflicts for merge of 2624fbca to eclair-mr2 Merge commit '09f82ec61cca00bd8b08529a94139dd6ac5cec73' * commit '09f82ec61cca00bd8b08529a94139dd6ac5cec73': Fix #2320798: Device hang then runtime restart