tree 2b828269e9cfd9bd6dba137bd5fe72529f8ca175
parent 64f3e1a283ee33a5eaaef753e93de10ecf8b503a
parent 0b1e527a804b8593d352e00738ed57dafd4b3f45
author Elliott Hughes <enh@google.com> 1431740524 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431740524 +0000

am 0b1e527a: am 09050fc9: am cd7d9d83: Merge "Don\'t use TEMP_FAILURE_RETRY on close in recovery."

* commit '0b1e527a804b8593d352e00738ed57dafd4b3f45':
  Don't use TEMP_FAILURE_RETRY on close in recovery.