tree b8f8f988ccda09f844ee3f15de0c535f23c81930
parent 1b316a10b21db00cbeb1522b69c081615576dbf3
parent 241a85fb85ae2122d8f1b12d7dc4923206c9063a
author Xin Li <delphij@google.com> 1633683589 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683589 +0000

[automerger skipped] Merge Android 12 am: 896d2d67c4 -s ours am: 794651b5b1 -s ours am: a3c654b363 -s ours am: 433e5bd22b -s ours am: 241a85fb85 -s ours

am skip reason: Merged-In Ib3442e1d1e329876a7cfcdcae05f3ff6547a0c5a with SHA-1 f4916c501f is already in history

Original change: https://android-review.googlesource.com/c/platform/external/nanohttpd/+/1847431

Change-Id: Ifa13608c617eb5068ffdb448ee77c1024a48675e