| commit | 00c82495244c54d9a79e5cbe7314900e81a9be4b | [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 | 2c9be418dc575ea7b0be621d7d9020d814ddf050 | |
| parent | 2beecf150dd94dda7011511208ffe3a6bf150e62 [diff] | |
| parent | 4eb0a7423b668e77ff89d63754b7e005ecd498b9 [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':