tree 3f70bcdd2c183a63f00143e647bd9b6750d41b91
parent 79a4e2efc502979c21ebbc164691d61b1634362a
parent 06eda4e2d5cb8aff7253e6be111553086fbc9b82
author Irfan Sheriff <isheriff@google.com> 1350603095 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350603095 -0700

am 06eda4e2: Merge "Fix native crash when driver commands time out" into jb-mr1-dev

* commit '06eda4e2d5cb8aff7253e6be111553086fbc9b82':
  Fix native crash when driver commands time out