diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-08-27 17:41:40 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-27 17:41:40 +0000 |
commit | 2c960293f0e55b91986aa92d8e1f4eb2dd477085 (patch) | |
tree | 95401f662bd95aede9db40bf315066c2939486ac /identity/support/src/cppbor_parse.cpp | |
parent | 2dd55590fd09ad506680b4888b4cf19f09d3eccc (diff) | |
parent | 02b3ca4e7c61d149bedae1cd8fa79492f323f2f6 (diff) |
[automerger skipped] Merge "Undefine NAN after including it in Looper.h" am: 02b3ca4e7c -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: I858e2b22b6c38f250e4f216df984dbae9f77471a
Diffstat (limited to 'identity/support/src/cppbor_parse.cpp')
0 files changed, 0 insertions, 0 deletions