tree 3f70bcdd2c183a63f00143e647bd9b6750d41b91
parent 25b11e81b30d3e1b878da72155b9e28a96c8dee9
parent 6d4af736d09fcc7165d3e36bc86b7292d76ad1a4
author Irfan Sheriff <isheriff@google.com> 1350603251 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350603251 -0700

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

* commit '6d4af736d09fcc7165d3e36bc86b7292d76ad1a4':
  Fix native crash when driver commands time out