tree e0ea695214b7f89e1a380ececcb0d027c226d8c3
parent 9bdfc306e9c2a5194f71a25eb99b7fd367647509
parent 4c3a90b696435ccd894dd9e23a7b647f8eedec0e
author Colin Cross <ccross@android.com> 1642128935 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642128935 +0000

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

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

Change-Id: I049dd98009c146c7b09c12d91df4db28691c3516