tree c73a16dc610c99520a93c2b33b8a4a3d7e64a00f
parent 85e5a7f644ea451791e3dc4cc122e7fbfb75ed81
parent 4c47d05f12d29fcb9e2f3f7adaedd012dd505ca9
author Xin Li <delphij@google.com> 1599784809 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599784809 +0000

[automerger skipped] Merge "Merge Android R" am: 4c47d05f12 -s ours

am skip reason: Change-Id I3ba28680e41e79b77c1b2bcac8b97a88afbf12cd with SHA-1 85e5a7f644 is in history

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

Change-Id: I3b1476c55a689d177fcfe9232ea8027e6200136b