tree b6ce04ec9b728796470ea82de2c83029a2fddb59
parent 27927d5d55eb4bd9087bdeba7df1e98f280177bd
parent 1e964ed808798a56664853e2aeffdc47c676ac5a
author Christopher Tate <ctate@google.com> 1384829309 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384829309 -0800

am 1e964ed8: am d6bbc544: Merge "Harden against transiently unavailable backup transports" into klp-dev

* commit '1e964ed808798a56664853e2aeffdc47c676ac5a':
  Harden against transiently unavailable backup transports