OSDN Git Service

am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread
authorEric Rowe <erowe@google.com>
Sat, 23 Oct 2010 01:21:09 +0000 (18:21 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 23 Oct 2010 01:21:09 +0000 (18:21 -0700)
commit288f13730e6535fb36581781196a55a6f2d198d6
tree009a95e38308dbd15231d7aa5ed5a1c7d939465c
parentf5b5d177a94bf5b1e59c11fb6f53e2dd40271f59
parent8de43ab5ba818b9552326d5383729b3e6fbf7c82
am 8de43ab5: Merge "Change disable timeout for BT disable stress test" into gingerbread

Merge commit '8de43ab5ba818b9552326d5383729b3e6fbf7c82' into gingerbread-plus-aosp

* commit '8de43ab5ba818b9552326d5383729b3e6fbf7c82':
  Change disable timeout for BT disable stress test