tree cef87e8ae39ba698a34d80b7e8be04490d996505
parent d6ba70236d6867b8f167f2684fbb4cc27e7ebdfa
parent df8e88e8d8b46486ee359407f1f87c526090f375
author Xin Li <delphij@google.com> 1633683587 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633683587 +0000

[automerger skipped] Merge "Merge Android 12" am: 3ca3226c6c -s ours am: fde26bfc52 -s ours am: 56516f92a7 -s ours am: acfb306cd5 -s ours am: df8e88e8d8 -s ours

am skip reason: Merged-In I15335ac18df0a221456779909493ed186b4d5f85 with SHA-1 0500a76f00 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/hamcrest/+/1847424

Change-Id: I4e66c8d5c5ed2756c3049255a14bfc6220b19a95