tree 0a58e58e5bda5ce98903ba66083db2c518d81166
parent a800d90f60793ea911c0d5d8b954e5ee348401e8
parent bc4051cc14b4b31d7cceb29c22c078e4024a6755
author Justin Yun <justinyun@google.com> 1503531169 +0000
committer android-build-merger <android-build-merger@google.com> 1503531169 +0000

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

Change-Id: If22e85e39707b65b33571d2ce42d0fb84c4ac518