diff options
author | Xin Li <delphij@google.com> | 2021-08-17 19:46:25 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-17 19:46:25 +0000 |
commit | 27f0d699a4e96709efb3e5ea0a8220e51029286a (patch) | |
tree | b8f8f988ccda09f844ee3f15de0c535f23c81930 | |
parent | 7ebff1b1e4f44263d6479d7cf49ec74da62445fb (diff) | |
parent | 859fd9ecdd93168bb9f398f3d05e5122c7269226 (diff) | |
download | nanohttpd-27f0d699a4e96709efb3e5ea0a8220e51029286a.tar.gz |
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: f4916c501f -s ours am: 859fd9ecdd -s ours
am skip reason: Merged-In Ib5ab196079c9e81e961d5994ea8de3e05bf45b20 with SHA-1 7ebff1b1e4 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nanohttpd/+/15571677
Change-Id: I22a2b1a7d5864169d8ea4060e5e626216251e791
0 files changed, 0 insertions, 0 deletions