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

am: 36a1b38e89

* commit '36a1b38e899687b217fe6e043022ed83fc37386b':
  Backport of backup transport whitelist

Change-Id: I69eec8b0c2558b00b319df0d5fa46784b08a5401
This commit is contained in:
Chris Tate
2016-05-26 00:34:08 +00:00
committed by android-build-merger

Diff Content Not Available