tree 8465d199e0a3d2148d1d1e6cd33cf0650a3eed32
parent de3f6adf54fafea96cae82456fa28cffb3e76e15
parent 9b7fbccdb43ce7ce614290929744bc7ddf115b59
author Justin Yun <justinyun@google.com> 1505368117 +0000
committer android-build-merger <android-build-merger@google.com> 1505368117 +0000

Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 53401d7c35
am: 9b7fbccdb4

Change-Id: Iefb1438bf398a6d8c6c7fd3c1ba2b980f51b96fa