tree e07b5844f36bc96db9357d7185577e4b97a96982
parent fac674a05470a037fd91a7971ad21fc5969c00e6
parent 967fa06f3a69dc3a8876cb197f21807ded5da037
author Greg Kaiser <gkaiser@google.com> 1572283932 -0700
committer android-build-merger <android-build-merger@google.com> 1572283932 -0700

Merge "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""" am: 54de6a01ed am: 5c82028245
am: 967fa06f3a

Change-Id: Iccca3f2b035d5f9317ce246629da4d711a70aa56