tree d11f1e5049fa70d955aaea2df7ce97c7bf98e5d6
parent c0a1583de49212654dcf7112cdf0b17dff1d2591
parent b9dad887fd3b94bad5cb96fbf72d027dcfecba05
author Xin Li <delphij@google.com> 1607572016 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1607572016 +0000

[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: a362cb8adf -s ours am: b9dad887fd -s ours

am skip reason: Change-Id I82b606f10035eae94aeb06f41070068ec1ec0ca3 with SHA-1 713c692f78 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7cf4a1b133a9c3b7f9727095bb9035b056efb161