| commit | 10454ac0160379de136bacbd7919f97228e906e6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Dec 19 23:12:12 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 19 23:12:12 2017 +0000 |
| tree | d439cbca5e5a690085c6ec1d5ad638557740b042 | |
| parent | 0e597893586fa5c6dd748561959a454febf0ec76 [diff] | |
| parent | 8fe2ac76a9f9439dfbab31efc6c308588364e304 [diff] |
Merge "Disable FTP and FTPS." am: 8725a20f04 am: 8fe2ac76a9 Change-Id: Id09ff513b227b50486375ffde0e21355f2b90a8f