tree 5c3acf17688fdf18536efa67e833be9db3611f99
parent c8396d5200ba63c8d69e65a125b9fc872f3228b1
parent cffaf6881e7a54ed7941408e49fcf353a55534d7
author Dan Egnor <egnor@google.com> 1270793336 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1270793336 -0700

am f5d506d9: am 78158db5: Hail-Mary attempt to avoid apparent blocking problems in readEvents().

Merge commit 'f5d506d92958d43449cb9ef77e6c9b6087e1cd68' into kraken

* commit 'f5d506d92958d43449cb9ef77e6c9b6087e1cd68':
  Hail-Mary attempt to avoid apparent blocking problems in readEvents().