tree 166bc858fa1732d213919d40abec74deb79861d2
parent 1906e72350b30192ce55202290d2d314ee90aaef
parent cd93b8befb1768e8110570e82b5e62ff347cd96f
author Elliott Hughes <enh@google.com> 1702060688 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1702060688 +0000

Merge "Stop saying -fno-emulated-tls in tests." into main am: 9cf79d736f am: cd93b8befb

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

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