Skip to content
Commit d5d7dbaa 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: 4b5b191b am: 1cdaea76

am: defe724c -s ours
am skip reason: change_id I4ccc0a2e13fc49a0109e9823fbcb4077e11455d5 with SHA1 df848ac2 is in history

Change-Id: I3602771542d0338ed059d6b87005ff5d2da167b2
parents 2a3bcc58 defe724c
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment