| commit | 4eb0a7423b668e77ff89d63754b7e005ecd498b9 | [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 | 09b9b21af72d3ec57979d8cde93c63b72e2db7cc | |
| parent | 9b070feff223f35a417daf4c938f9b928a1d4793 [diff] | |
| parent | 0f88bfc2d868c62951b4a60798d221986b7d108f [diff] |
am 673a66e3: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 * commit '673a66e357f49f939cf8e7f603ff14b8474c9032':