tree a25d27854890a1ab3b8973dd4e4d09635b555361
parent fe47833b095441d75628b6d26c2f9908806c892b
parent 8339bc672a0c5a31d286fb55ff22341d73efc119
author Elliott Hughes <enh@google.com> 1432925449 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1432925449 +0000

am 8339bc67: am 5944bcd8: am 1441a965: Merge "Really don\'t use TEMP_FAILURE_RETRY with close in recovery."

* commit '8339bc672a0c5a31d286fb55ff22341d73efc119':
  Really don't use TEMP_FAILURE_RETRY with close in recovery.