tree 90bf63ea0df96f6d6feae07aa7d689e5ba7ff105
parent 5364f859acfea1d39c7377a76a1b7e153239cbe4
parent 8169ac1d6634a9586abd8e0ccb6a6148e21174e9
author Miguel Aranda <miguelaranda@google.com> 1657721145 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1657721145 +0000

Merge "Fix failing Libcore benchmarks." am: 9b62bec021 am: 0f38154c3d am: 6f60adb665 am: 8169ac1d66

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2152634

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