tree 371f9b2367f6772ff5d046a1ecc559b0e0126834
parent 85de10d2ef1a1db40efc4065e2b3ce05670d874a
parent 9adda85e9aa22c51618569247735f8099705e2c0
author Xin Li <delphij@google.com> 1598559849 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598559849 +0000

[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: de4007ae5d -s ours am: 6efd6ca8e3 -s ours am: d77e7aa6cd -s ours am: 9adda85e9a -s ours

am skip reason: Change-Id I0d2e660fd93ef3ddba63e46b3ac369996c151669 with SHA-1 9eee380073 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/protobuf-codegen/+/12469779

Change-Id: I69857413172eba35c41c518ac5f1656eaf113f09