tree a417725061238ea05f076f79565862174a511732
parent e413937ecf0597c9d112dd7fda56dfac41043a76
parent 470ac46f63c87373cca3f3ba479f5f504aeb628f
author Elliott Hughes <enh@google.com> 1725045481 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1725045481 +0000

Merge "<sys/timerfd.h>: don't redefine constants." into main am: 470ac46f63

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

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