| commit | b2ecaba2480b01cedc1c0fa474ad23e479ac153c | [log] [tgz] |
|---|---|---|
| author | Ryan Prichard <rprichard@google.com> | Thu Sep 07 21:24:23 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 07 21:24:23 2023 +0000 |
| tree | 3ce1c2714ee82eadb3825341f134fb4ebd786d4c | |
| parent | 6daeb10167febcd00f4786f73be2e1cd568e757d [diff] | |
| parent | 3cef7f7bfe33b4eabaa55ed8fc6b6cd571f9ddd6 [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Undefine NAN before defining it again" into main am: 3cef7f7bfe -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743884 Change-Id: Ib905f1d808d454274dd0a31891175fe7d34bd05a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>