| commit | 5742e2ba25a75243ec0a644cf8bad788a310e5d4 | [log] [tgz] |
|---|---|---|
| author | Ryan Prichard <rprichard@google.com> | Thu Sep 07 22:10:17 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 07 22:10:17 2023 +0000 |
| tree | fcf3c34f5ec1fc8d37f615545fe53d7f0e336b39 | |
| parent | ff7c699b31c209d083d830e166d483f5aa2715e1 [diff] | |
| parent | 3e5ee9a6e622ea0bb7ceca6415cd9a941018c9ef [diff] |
Merge "Undefine NAN before defining it again" into aosp-main-future am: 236bbe3305 am: 3e5ee9a6e6 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24685603 Change-Id: I277860732d04b798fc05a0701d2d944e8cc432c0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>