Merge "Merge "Make fake libart for misbehaving apps be loaded." am: 4bc3d32b15 am: 8f578530a9 -s ours am: 67f3a19e9a" into nyc-mr1-dev-plus-aosp
am: 8386eae2a1
* commit '8386eae2a18345c71cd3c72b48dbe107597ee28c':
Make fake libart for misbehaving apps be loaded.
Change-Id: I75d880e8e1d4f297ae624cd94f46654f427e0386
This commit is contained in: