DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886 am: 1fa817c057 am: 040cf14047 am: 0905c8f398 -s ours am: d39c0a8d77

am: d8e548f6ea

* commit 'd8e548f6ea5e185bd0f9e22acef9355f5307245d':

Change-Id: I25c53c4fe1a0ece0d9c20e339f26a81f5cf62d78
This commit is contained in:
Christopher Tate
2016-05-27 03:32:02 +00:00
committed by android-build-merger

Diff Content Not Available