tree e0ea695214b7f89e1a380ececcb0d027c226d8c3
parent b14bbc3403f7c7d8e58ab4a041ab3042c9596a34
parent f96c3ad47e3dcc0d064ebb3fd99dc05f52d79358
author Colin Cross <ccross@android.com> 1642130017 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642130017 +0000

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

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

Change-Id: I3e2e55e9d305742c5bb4e27c6ee2482d39d55ed4