tree 8d38807415f2ba86d6a4dd1682ca4fb7b543d13a
parent 5e7788d05ed44e37fd49183e03bc668e718abfdb
parent 8d4e9ad2fa2d548618e67ffaf76e0443fbb3b66b
author Brian Muramatsu <btmura@google.com> 1339119564 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339119564 -0700

am 8d4e9ad2: Increase Bluetooth test timeout

* commit '8d4e9ad2fa2d548618e67ffaf76e0443fbb3b66b':
  Increase Bluetooth test timeout