| commit | 2bf74640c72cd81db19eceb5acf41a2a66066ee4 | [log] [tgz] |
|---|---|---|
| author | Ryan Prichard <rprichard@google.com> | Thu Sep 07 22:11:54 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 07 22:11:54 2023 +0000 |
| tree | f0c4ff33bfeef7e23709af597c2f1b194cc07044 | |
| parent | 5a83416f6a160462e28822b74a778de116735683 [diff] | |
| parent | ac892dc7bcb9e49564eacfbbbb824d6d4173e1c1 [diff] |
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Undefine NAN before defining it again" into main am: 3cef7f7bfe -s ours am: b2ecaba248 -s ours am: ac892dc7bc -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2743884 Change-Id: If6819640d3fa5413881bc914055132280cf3eb12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>