| commit | 24ceca96af925ac19a1fa337afc0e739d9cb11ad | [log] [tgz] |
|---|---|---|
| author | Christopher Tate <ctate@google.com> | Wed May 25 23:16:15 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed May 25 23:16:15 2016 +0000 |
| tree | 4fc4708b2bef5d80c43bfbb20ad2626c3b439f5f | |
| parent | 8238207ce6268422bcdb50d44f03e6a220081294 [diff] | |
| parent | 4c559cdadea4b74262b40cbefe4a76a0e22ccc68 [diff] |
DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade * commit '4c559cdadea4b74262b40cbefe4a76a0e22ccc68': DO NOT MERGE : backport of backup transport whitelist Change-Id: Iff8942e506b14cb2d0e64623daea3bdc3cee2142