| commit | 040cf14047fb025f603c73e56a9bfd06c84a2483 | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Thu May 26 12:31:55 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu May 26 12:31:55 2016 +0000 |
| tree | d22c845d5c4e5e7edc5610d1dd72d3336f42e5ae | |
| parent | c69aa838a8f89ba7476ce554ecf5a19a6de78b28 [diff] | |
| parent | 1fa817c057c909d1ba4f5a356f6eb4b52a3bc628 [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 * commit '1fa817c057c909d1ba4f5a356f6eb4b52a3bc628': DO NOT MERGE : backport of backup transport whitelist Change-Id: Ia409bff3b5db1ba686d884f81e45b242ec1ae38f