Diff - 946f3948b42e405bc0c21917498f668c41303f5b^1..946f3948b42e405bc0c21917498f668c41303f5b - third_party/android.googlesource.com/platform/bionic

commit: 946f3948b42e405bc0c21917498f668c41303f5b
[log]
author: Xin Li <delphij@google.com>
Fri Aug 13 21:03:07 2021 +0000
committer: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri Aug 13 21:03:07 2021 +0000
tree: 93d699e33848416768e81412a3b42677c161c6d4
parent: 1430c476f22471aaefababc54036a71a08ec73fa [diff]
parent: 1f637922e6ad0e7ec723619342c715f544fcfa60 [diff]

[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 1f637922e6 -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/+/15546344

Change-Id: I5545d957715724c09a65a2e717eb151e7b61494f