| commit | 07c71147dda8bda9a40bea10f6029d6cfcaae00f | [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 | 693b4fff20aaf8270fea81732015d8e8720cbb8d | |
| parent | b99349e1d33a4ab3cd03b4ca5cc495a7ae65fca1 [diff] | |
| parent | 09f82ec61cca00bd8b08529a94139dd6ac5cec73 [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