tree 0adb80eba45478e68bd6206e15ae56b9ba000c1e
parent 23bcd8d298597659622919027c9ea921d5eed513
parent 125beceefd44f6abd17ff336bb989e1850965bd8
author Kenny Root <kroot@google.com> 1350430157 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350430157 -0700

am 125becee: am 7abbbc68: Merge "Add TEMP_FAILURE_RETRY to ZipUtils"

* commit '125beceefd44f6abd17ff336bb989e1850965bd8':
  Add TEMP_FAILURE_RETRY to ZipUtils