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 00:12:37 +0000 (00:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 May 2016 00:12:37 +0000 (00:12 +0000)
commit88c9eae886ff99d37da0f13af4b2e045e9332289
treec11102bf971a0f086c8cd83e072b15982981f759
parent2cfc6baa2286a256585a7fb6295f9b66ff641726
parent24ceca96af925ac19a1fa337afc0e739d9cb11ad
DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8  -s ours am: 077534b101 am: 4c559cdade
am: 24ceca96af  -s ours

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

Change-Id: I1c79f9a012981dc2be9c8342674780c85bbf6663