tree 93d699e33848416768e81412a3b42677c161c6d4
parent ab5c8dbdfe310554b96e0261d148166a9726d2f9
parent ad19c87f806d8cc30f3dd38b2cf8b2093eb04d3a
author The Android Open Source Project <initial-contribution@android.com> 1628883224 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628883224 +0000

[automerger skipped] Merge ab/7633965 am: ad19c87f80 -s ours

am skip reason: Merged-In Ic7a83fb01a39113d408ed0c95d27f694d5a2649c with SHA-1 c75fbc7b8a is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/bionic/+/15546708

Change-Id: If48afed66b2c159c6ef27b9e0fde2715a31615b6