Diff - refs/heads/android10-d4-release^2..refs/heads/android10-d4-release - platform/external/nanohttpd

commit: 9e6fdd3de9cf7ebc3a16c614147a28e63e62485e
[log]
author: Xin Li <[email protected]>
Sun Feb 24 02:21:36 2019 -0800
committer: android-build-merger <[email protected]>
Sun Feb 24 02:21:36 2019 -0800
tree: 5a49bf1f2dc7017bded0a31658c22563ae37ea8b
parent: 48749886ffc0c5cea6439d787c9ce730363f80fa [diff]
parent: a649e266c52edf77dd42c2dbf12980897774f3d6 [diff]

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

Change-Id: I11497a555ad1772e3b990343b7b72d91abb0b2da