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