| commit | ddb9d0bedf7a28c091964db51f3469d7d68b70c2 | [log] [tgz] |
|---|---|---|
| author | Tsu Chiang Chuang <tsu@google.com> | Thu Mar 01 17:15:32 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 01 17:15:32 2012 -0800 |
| tree | 865057aca0fddafe1c8e133a70250118bc38ee52 | |
| parent | 756fe38d0883966d143d81f38bb40a4b028ad463 [diff] | |
| parent | 8f0c03b7833c719c29198be0e4fecbdfb4013e64 [diff] |
am 8f0c03b7: am 673a66e3: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 * commit '8f0c03b7833c719c29198be0e4fecbdfb4013e64':