tree 4642e83df9744358ef6bd590cad490dbdbea1d33
parent c31bf1f64208f5526a544951f5899520bf49e994
parent a68ab9cc2588dc79f5a1a5e55b2862772192d99d
author Elliott Hughes <enh@google.com> 1363717426 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363717426 -0700

am a68ab9cc: am bbb8672d: Merge "Fix ConcurrentCloseTest\'s write test to ensure we\'re really blocked in write(2)."

* commit 'a68ab9cc2588dc79f5a1a5e55b2862772192d99d':
  Fix ConcurrentCloseTest's write test to ensure we're really blocked in write(2).