refs/heads/android11-d1-release - platform/external/mockftpserver

commit: 1f487440520b7264f9134079441bce0adcf05af0
[log]
author: Xin Li <[email protected]>
Sun Feb 24 02:21:04 2019 -0800
committer: android-build-merger <[email protected]>
Sun Feb 24 02:21:04 2019 -0800
tree: 543c8abe06803049a317b3d885f475e51885b4b3
parent: 5b8cdacbaa019af72b7f99d1f10e9585203c3bab [diff]
parent: 881a3b1d788d88c4c0a4b956319a5053817f1832 [diff]

[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
am: 881a3b1d78 -s ours
am skip reason: subject contains skip directive

Change-Id: I30599762fdedd129c7a6a104ed0b9fe3a768d999

tree: 543c8abe06803049a317b3d885f475e51885b4b3

branches/
MockFtpServer/
tags/
Android.bp
MODULE_LICENSE_APACHE2
NOTICE
OWNERS