tree 7dcfe9fa0668736c18226284475f96b905e03c44
parent 8e0aaf8a500102a0663bd898f2aded493432013b
parent b840b4487c06948cdc9597675a4ec292f398b223
author Xin Li <delphij@google.com> 1598554979 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598554979 +0000

[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 876d557f3a -s ours am: b840b4487c -s ours

am skip reason: Change-Id I72aae48ac01c06c4417934962ce0f54e59713fbb with SHA-1 11a338ac8a is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/12469982

Change-Id: Id1a1ac6dc4d7c5a577f1e73b3a0c4ccff4bc4caf