tree a25d27854890a1ab3b8973dd4e4d09635b555361
parent 8339bc672a0c5a31d286fb55ff22341d73efc119
parent 92eea1bc414a7b6faedaf812c33ede17403fcaf7
author Sami Tolvanen <samitolvanen@google.com> 1433172413 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433172413 +0000

am 92eea1bc: Handle BLKDISCARD failures

* commit '92eea1bc414a7b6faedaf812c33ede17403fcaf7':
  Handle BLKDISCARD failures