tree a35f8de7f7fcc24f7c143122acd5e23b9c5c649a
parent c4db1a1b7ee3a181112ba499d9fd343d01d29a12
parent 49bdcae508cdc562d5c16f626aa9b51165b5e8d1
author vichang <vichang@google.com> 1622828068 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1622828068 +0000

Merge changes I9b3f4c11,Ie51c4933 am: 49bdcae508

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1724652

Change-Id: I8008e73bb123ff76747bad8268bee8a1179ee9c7