tree 2b828269e9cfd9bd6dba137bd5fe72529f8ca175
parent 1fce242653db7dbeca07523871175c758a47eea1
parent 09050fc92ef94a5ea0ee84f09f511850424f9216
author Elliott Hughes <enh@google.com> 1431739828 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431739828 +0000

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

* commit '09050fc92ef94a5ea0ee84f09f511850424f9216':
  Don't use TEMP_FAILURE_RETRY on close in recovery.