tree dddcaaf987ce779f1713754dde60faaf46a0174e
parent 9545dc020ea11649d70dcbe911a8e82a3254a4ea
parent 1223e5a3115e825567972da26e38c0016bdfa268
author Matthew Xie <mattx@google.com> 1347001643 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1347001643 -0700

Merge "Fault tolerance in Bluedroid" into jb-mr1-dev