tree a25d27854890a1ab3b8973dd4e4d09635b555361
parent cbff4f36ebf41bca9d01bc2959f84980638e89b3
parent 07ec625a61263ea760db93c106d966d4406fbc54
author Sami Tolvanen <samitolvanen@google.com> 1433173739 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1433173739 +0000

am 07ec625a: am 92eea1bc: Handle BLKDISCARD failures

* commit '07ec625a61263ea760db93c106d966d4406fbc54':
  Handle BLKDISCARD failures