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

* commit '1e964ed808798a56664853e2aeffdc47c676ac5a':
  Harden against transiently unavailable backup transports
tree: 02cbf8421d6b998bf76e2b5b75cde48fc7904f41
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml