tree 6071d4ef53f27a4e3b17ff79d9dee5af9f92a083
parent 5f728e907ce9370732d457cb48fd771963765b3f
parent bf6696874d1b57ffddc7848450b20e926ad5d0a4
author Elliott Hughes <enh@google.com> 1342052635 -0700
committer android code review <noreply-gerritcodereview@google.com> 1342052635 -0700

Merge "Fix the timeout in bt_enable."