tree 7585e06b1dd8e68aaa6e078140b2dd2096aa5f66
parent b56db27d08c168a9167bf2226baaebf24a0fe5aa
parent a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8
author Doug Zongker <dougz@android.com> 1284076909 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284076909 -0700

am a2c9a1e8: am aaf3f56c: block is bad if ioctl() returns nonzero

Merge commit 'a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8'

* commit 'a2c9a1e8a2b99bd8197c83b2f749ec61bc0312f8':
  block is bad if ioctl() returns nonzero