tree 04a5e6057858b325acb23d67de23571f2a4c087b
parent 81542e662c893601ee81364ec215a5f4d973b8cc
parent c85a8823cab8b3d3f0a0a4f83820e3751f598a2d
author Ryan Prichard <rprichard@google.com> 1547848925 -0800
committer android-build-merger <android-build-merger@google.com> 1547848925 -0800

Merge "Turn off XOM on libnstest_root.so"
am: c85a8823ca

Change-Id: I70bba11c696ede1df27ca77400cdb8b6c25f450a