tree d96293100261c58fcaa7023504f7717ba8604480
parent e59a73e955cab538261ae9b9bf64fd02a7cc2c2d
parent d23326017413043f14310af13109b326873737dc
author Frederick Mayle <fmayle@google.com> 1670610448 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1670610448 +0000

import merge-0.1.0 am: d6b6c53f3e am: b02ae3cc33 am: d233260174

Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge/+/2336343

Change-Id: I8000735d340042a60004d56a7092f22831170e8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>