OSDN Git Service

Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
authorTsu Chiang Chuang <tsu@google.com>
Fri, 2 Mar 2012 01:05:43 +0000 (17:05 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 2 Mar 2012 01:05:43 +0000 (17:05 -0800)
commit3e70127021f5d5940edfdefd7e33fd65d4ec0449
tree4d9adf67a9b3885838aa5dcc8b787f16eca3e5e7
parent941ff38d05f1d870df224ac329d16ab2207b94a1
parent4b1afab106f3959ba56fba08fbdccee5d15068bc
Merge "extend timeout to allow for more time for the device to connect." into ics-mr1