tree 0ac5c9c589e66b897a057d8fd7e19d7772dce91e
parent 08ecd72b9253b30a7d5f6447256a63f1be92fc4e
parent 898398887f9131f1465fe353feede723187f109e
author Brian Muramatsu <btmura@google.com> 1339119857 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339119857 -0700

am 89839888: (-s ours) am 8d4e9ad2: Increase Bluetooth test timeout

* commit '898398887f9131f1465fe353feede723187f109e':
  Increase Bluetooth test timeout