tree 1d95353f6bcac7f19a216042a38bfdbd12e833aa
parent 83ea1ded1672fa70b67af1ba9050a9e9a6825be1
parent 5d56f7da547e773aa5028f09b540620300c8bb55
author Treehugger Robot <treehugger-gerrit@google.com> 1630089637 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630089637 +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: 5d56f7da54 -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: Ib708691580e5340353ca23439da5a5774e7f2af5