OSDN Git Service

DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am...
authorChristopher Tate <ctate@google.com>
Thu, 26 May 2016 17:56:38 +0000 (17:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 17:56:38 +0000 (17:56 +0000)
commitd39c0a8d775988bfbf319777b2a17af1579b531a
tree137f14f8c844e8c112082dec9034de53a4462947
parente78ba24c176fd6a0c54eaf7e52be545952ba1ab7
parent0905c8f3989ab607b659fdc20a1b9a56794d2b6f
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

* commit '0905c8f3989ab607b659fdc20a1b9a56794d2b6f':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I6d0b878ea43d98761b93865604e8cb97410cdea9