| commit | 0905c8f3989ab607b659fdc20a1b9a56794d2b6f | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Thu May 26 12:52:19 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 26 12:52:19 2016 +0000 |
| tree | 0436d86a8fd64712705a1f472363f59f3a2b931a | |
| parent | 38a37f336f96896146efc1a85310504bf4f77116 [diff] | |
| parent | 040cf14047fb025f603c73e56a9bfd06c84a2483 [diff] |
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 * commit '040cf14047fb025f603c73e56a9bfd06c84a2483': DO NOT MERGE : backport of backup transport whitelist Change-Id: I3f6a42a6a1c3492439a8a7a93537de52a6f1cf1f