tree 321abad48a604c9a82fedb73084280d34a971918
parent 8e90893c775e13b91637cc3b5668ff030936850e
parent 350c8052da9e492401c4d72eeb61fadee04eb11e
author Justin Yun <justinyun@google.com> 1505368032 +0000
committer android-build-merger <android-build-merger@google.com> 1505368032 +0000

Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: b85e45fc3c
am: 350c8052da

Change-Id: I3483a186b9781a4696534976f3890980b86edaab