commit | 88c9eae886ff99d37da0f13af4b2e045e9332289 | [log] [tgz] |
---|---|---|
author | Christopher Tate <ctate@google.com> | Thu May 26 00:12:37 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Thu May 26 00:12:37 2016 +0000 |
tree | c11102bf971a0f086c8cd83e072b15982981f759 | |
parent | 2cfc6baa2286a256585a7fb6295f9b66ff641726 [diff] | |
parent | 24ceca96af925ac19a1fa337afc0e739d9cb11ad [diff] |
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