Commit 5e2b4d18 authored by Justin Yun's avatar Justin Yun Committed by android-build-merger
Browse files

Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 2b6bc205 am:... 

Merge "Mark the module as VNDK or VNDK-SP in Android.bp" am: 2b6bc205 am: eb2c096c am: abad1eec  -s ours
am: 1f58b481  -s ours

Change-Id: I8380f1c2ddcbb8d76067c9d4d9d8bd14070e0635
parents 6fa2908e 1f58b481
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment