Commit b2f04265 authored by Sasha Smundak's avatar Sasha Smundak Committed by android-build-merger
Browse files

[automerger skipped] Merge "Convert Android.mk file to Android.bp" am: a3916dad am: dd144a87 

am: c9081775 -s ours
am skip reason: change_id I8e1d77b641756d5049987415ffde50195e0c6eed with SHA1 dafa1584 is in history

Change-Id: Iad6938dec957c48bac2c9d4ee7104957cc65dbda
parents dafa1584 c9081775
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