diff options
| author | Xin Li <delphij@google.com> | 2021-10-08 01:39:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-10-08 01:39:25 +0000 |
| commit | a3c654b363b3dabceb21be00d15ca82dc75e557b (patch) | |
| tree | b8f8f988ccda09f844ee3f15de0c535f23c81930 | |
| parent | 859fd9ecdd93168bb9f398f3d05e5122c7269226 (diff) | |
| parent | 794651b5b1e6faa8da158b024b75ac1f9446fa2a (diff) | |
| download | nanohttpd-a3c654b363b3dabceb21be00d15ca82dc75e557b.tar.gz | |
[automerger skipped] Merge Android 12 am: 896d2d67c4 -s ours am: 794651b5b1 -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: I63722199f56e54867e78d8c2c9bf0435f76b93e5
0 files changed, 0 insertions, 0 deletions