tree 471f2def33826330e5038791dee8858849d4806c
parent bcabb85fc61f39a185ce7328b77e6eb5875f35a2
parent 82255127737bf95e82b6a08372095d3a7fddd6d5
author Logan Chien <loganchien@google.com> 1499652285 +0000
committer android-build-merger <android-build-merger@google.com> 1499652285 +0000

Merge "vndk-def: Remove HL-NDK from code" am: 36be17f025 am: ebc811daac am: 5e17869be9
am: 8225512773

Change-Id: I99ea5e1267f640e431731c75b2547792ebfb1ecb