| commit | 8f0c03b7833c719c29198be0e4fecbdfb4013e64 | [log] [tgz] |
|---|---|---|
| author | Tsu Chiang Chuang <tsu@google.com> | Thu Mar 01 17:11:22 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 01 17:11:22 2012 -0800 |
| tree | 93ab4a2fffb1013b8d48cab6634ff8dbb567cb35 | |
| parent | 6053b195bcd49676b46b2257f6e1da04d0b4d9a5 [diff] | |
| parent | 673a66e357f49f939cf8e7f603ff14b8474c9032 [diff] |
am 673a66e3: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 * commit '673a66e357f49f939cf8e7f603ff14b8474c9032':