tree a37550c760bf26300ed6e6277510b96da8c753c8
parent 9a5e2a2611997d7803f079b8adb3535b6abc80fb
parent aa4df5c45b99438282db3a94cb7682c480e0eccd
author Sami Tolvanen <samitolvanen@google.com> 1432830064 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432830064 +0000

am aa4df5c4: Merge "Handle BLKDISCARD failures"

* commit 'aa4df5c45b99438282db3a94cb7682c480e0eccd':
  Handle BLKDISCARD failures