tree a3c1d564cc73d9f6e92f8ef4506d039816a56575
parent 12973d7c220d261c3748e3c8051b3ef478cf5b7a
parent a90fe20374f74dcddbd4b4cddd13e2c23c64e55b
author Daniel Erat <derat@google.com> 1451943916 -0700
committer Daniel Erat <derat@google.com> 1451943916 -0700

Integrate upstream changes to 2.2.0.

Merge tag 'nanohttpd-project-2.2.0' from
https://github.com/NanoHttpd/nanohttpd to add HTTPS support.

Bug: 26289868
Change-Id: I6ea26be836ec2682c766127f2fa41f4932557718