diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-08-27 18:08:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-27 18:08:16 +0000 |
| commit | 25bd38789456db98ada8572cb8502fb9424d2608 (patch) | |
| tree | bd78db947ac92a1c31b7790f7083f02723b758b1 /identity/support/src/cppbor_parse.cpp | |
| parent | 94f25b7caa6154e820720140b748788e217e2d6a (diff) | |
| parent | 8c85558acf4db06a060236688c5bc625f4756611 (diff) | |
[automerger skipped] Merge "Undefine NAN after including it in Looper.h" am: 02b3ca4e7c -s ours am: 2c960293f0 -s ours am: 8c85558acf -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: Ie9390e5fcd1ac6af998e01a3905a06ce61a599ad
Diffstat (limited to 'identity/support/src/cppbor_parse.cpp')
0 files changed, 0 insertions, 0 deletions