tree 8465d199e0a3d2148d1d1e6cd33cf0650a3eed32
parent b91071601b19e44d65cb1873a895a84deace5d16
parent 8f54321751dc3e4336ac4fcb919d15861b9c6551
author Justin Yun <justinyun@google.com> 1505369083 +0000
committer android-build-merger <android-build-merger@google.com> 1505369083 +0000

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

Change-Id: I09c8fc53049573573353c9960e385a86e704498a