tree 8a29ae7ece1b69fc5ad7a66f107fb60e8e978bd0
parent 0584e17af27d88c07c7bc7f6be3d94d89affe86e
parent 12cbb02ed842640cb24baa1d761af391f9ef0a56
author Xin Li <delphij@google.com> 1599789742 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1599789742 +0000

[automerger skipped] Merge "Merge Android R" am: 48f9195593 -s ours am: 12cbb02ed8 -s ours

am skip reason: Change-Id I688cf9a8010c1def4043e5b1caa819dbf18da5f4 with SHA-1 c3ac2cd7ed is in history

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

Change-Id: I9b7ad21c92edcabbdc11d56d470c3bea6afb4148