tree 3d0569d6e9382915afc2f591f0f8531a6855acfc
parent 7c8946c7dd54eb52ba5d1315dd00b2daa06a7bee
parent 44dba288f513b68b67ff71b7e24fcb43eff20231
author Xin Li <delphij@google.com> 1633681760 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633681760 +0000

[automerger skipped] Merge "Merge Android 12" am: a54e1e729e -s ours am: 115fe5b131 -s ours am: 304b179f39 -s ours am: 44dba288f5 -s ours

am skip reason: Merged-In I7f3a5953100762858d24643624e437854c390d99 with SHA-1 2389374e68 is already in history

Original change: https://android-review.googlesource.com/c/platform/external/objenesis/+/1847118

Change-Id: Ib8e5ca9dccfeea9dad4123b112556a48a376316d