| commit | 85beffad72e2351adcd45542c895970a2651f94e | [log] [tgz] |
|---|---|---|
| author | Ryan Prichard <rprichard@google.com> | Thu Sep 07 23:44:08 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Sep 07 23:44:08 2023 +0000 |
| tree | e8bac30017f9f5a6ae6cfedc06ca29a1967f5cf4 | |
| parent | 0c37aff8f7fb8602dd06ac1b6a24c1226f8af327 [diff] | |
| parent | c5ba9b1abda9cbe2d510799f3c0f699623db5bc0 [diff] |
[automerger skipped] Merge "Undefine NAN before defining it again" into aosp-main-future am: 236bbe3305 am: 3e5ee9a6e6 am: 5742e2ba25 am: c5ba9b1abd -s ours am skip reason: Merged-In Ie8e3e87189bcd7ed8fccccfc0a79e04a5bfda16b with SHA-1 dd390faa2f is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24685603 Change-Id: Ib9390a7ccc9a78524be2c4a2259b960a82f2eff6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>