Skip to content
Commit 88c9eae8 authored by Christopher Tate's avatar Christopher Tate Committed by android-build-merger
Browse files

DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6 -s ours... 

DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6  -s ours am: 077534b1 am: 4c559cda
am: 24ceca96  -s ours

* commit '24ceca96':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I1c79f9a012981dc2be9c8342674780c85bbf6663
parents 2cfc6baa 24ceca96
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment