tree 0a58e58e5bda5ce98903ba66083db2c518d81166
parent 34ef906087031769873855babec52854d1062cea
parent 2f9cb76a60517764714c6bbfd907327c2ee262c5
author Justin Yun <justinyun@google.com> 1503532409 +0000
committer android-build-merger <android-build-merger@google.com> 1503532409 +0000

Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 45d1ce0384 am: 77221f5321 am: bc4051cc14  -s ours
am: 2f9cb76a60  -s ours

Change-Id: I586ad207f7d07fdfd715565ab5f21da1701cd1bd