8f4d5c3c551cfdbf7af4fe99d337e3cb5157d0bb - platform/external/mockftpserver

commit: 8f4d5c3c551cfdbf7af4fe99d337e3cb5157d0bb
[log]
author: Bill Yi <[email protected]>
Wed Oct 24 19:23:18 2018 -0700
committer: android-build-merger <[email protected]>
Wed Oct 24 19:23:18 2018 -0700
tree: 5f26191a916640adf81cf12e406ad833c2c7acc7
parent: 2fd127a1b8dc4dc445c3ba4d7820aef2b61a3eba [diff]
parent: 8a2b08c04294777bf4a1ca1389603d187fd109ed [diff]

[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 0b86de2fb0  -s ours am: 116c741141  -s ours
am: 8a2b08c042  -s ours

Change-Id: I72e4a5590b3d657330950a1ca31f7ef520d0a966

tree: 5f26191a916640adf81cf12e406ad833c2c7acc7

branches/
MockFtpServer/
tags/
Android.bp
MODULE_LICENSE_APACHE2
NOTICE