tree d6b99a1afc147328664c90272098c6d3adc36d65
parent 7ab1a4d286898acffd1f3b444f9efc9e1d2a104e
parent 38a37f336f96896146efc1a85310504bf4f77116
author Chris Tate <ctate@android.com> 1464222167 +0000
committer android-build-merger <android-build-merger@google.com> 1464222167 +0000

Merge "Backport of backup transport whitelist" into mnc-dev am: 2cfc6baa22 am: 600d4f61ca am: c69aa838a8
am: 38a37f336f  -s ours

* commit '38a37f336f96896146efc1a85310504bf4f77116':
  Backport of backup transport whitelist

Change-Id: I63c06c0bdfc8a8a254bdf81fce5a76b46c59bfd8