tree 2eea2fcd6460d9ea208b6e10545bcb338c4336b8
parent 0500467f078c940f9156ec29bc129338e25d5d17
parent 25bd38789456db98ada8572cb8502fb9424d2608
author Treehugger Robot <treehugger-gerrit@google.com> 1630088757 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630088757 +0000

[automerger skipped] Merge "Undefine NAN after including it in Looper.h" am: 02b3ca4e7c -s ours am: 2c960293f0 -s ours am: 8c85558acf -s ours am: 25bd387894 -s ours

am skip reason: Merged-In I63bba8ea809a12571ddc88cd1d20f2adeedf0b30 with SHA-1 2dd55590fd is already in history

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1799831

Change-Id: Ib5bc37e8d2003111b2557ccca20bb61815e8c1df