tree d03c91547d89ea832b7213a1db9a25c3f772adb5
parent 9bf8474c27642f48aa27e2edf1bdd83b27d692c1
parent 2cfc6baa2286a256585a7fb6295f9b66ff641726
author Christopher Tate <ctate@google.com> 1464216349 +0000
committer android-build-merger <android-build-merger@google.com> 1464216349 +0000

Merge "Backport of backup transport whitelist" into mnc-dev
am: 2cfc6baa22

* commit '2cfc6baa2286a256585a7fb6295f9b66ff641726':
  Backport of backup transport whitelist

Change-Id: I73dff5d354cd5f26a7f2e68e16f8dd798d610fd3