tree dbe7c4df957dcd4187df8c7e51195c5dee70b44c
parent 979fda514ed9fdf576a0baf1fc5c63a7a8d068a6
parent d16cf94146b37f1b68c12c942b820cf66bcf83c8
author Justin Yun <justinyun@google.com> 1505367786 +0000
committer android-build-merger <android-build-merger@google.com> 1505367786 +0000

Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: cc10db2c9e am: 314e645a2a
am: d16cf94146  -s ours

Change-Id: Ifaf960be8d749811f3a366d3b9145f305be9a12c