tree e60e5a0ebcd7708affddfa192473c3d6329cd1f1
parent f1180aee35e910d3e120d9b7ba1639d9e6099098
parent 455f313d5189218f8151d7e0caf89e39220a7b00
author Ryan Prichard <rprichard@google.com> 1547849843 -0800
committer android-build-merger <android-build-merger@google.com> 1547849843 -0800

Merge "Turn off XOM on libnstest_root.so" am: c85a8823ca am: 6fb9f4ceee
am: 455f313d51

Change-Id: I606ca38e11c29d2282fef2cdbff5ed2d77fa6c73