tree a37550c760bf26300ed6e6277510b96da8c753c8
parent d026a28c22dfb15728b6db88d5b8e9b093de2fd7
parent cd391c23882cfa876c06fdf26146469489f41e8b
author Sami Tolvanen <samitolvanen@google.com> 1432833577 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432833577 +0000

am cd391c23: am aa4df5c4: Merge "Handle BLKDISCARD failures"

* commit 'cd391c23882cfa876c06fdf26146469489f41e8b':
  Handle BLKDISCARD failures