tree e0ea695214b7f89e1a380ececcb0d027c226d8c3
parent 9d090e29afcf83d8acab35a3628a5aa7bf04d458
parent ed2343ac19af19dfdd017419fd90414962f4ba28
author Colin Cross <ccross@android.com> 1642127751 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642127751 +0000

Merge "Use nullptr instead of NULL for make_pair" am: 9ba7525071 am: ed2343ac19

Original change: https://android-review.googlesource.com/c/platform/frameworks/compile/mclinker/+/1949444

Change-Id: I3e0eb28fba9561998796a516b907f223c5a71fb0