[automerger skipped] Merge "Remove PRODUCT_EXTRA_VNDK_VERSIONS from AOSP" am: 49cb47b2eb
am: 8d08cf0928
-s ours
Change-Id: I5f2b2e1437f027e031592bc6feec7d71125f5b41
This commit is contained in:
commit
9684a90e8a