Skip to content
Commit 694d4926 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Convert libmedia_jni to Android.bp" am: 85faffa7 am: 162d19f5 

am: 7eb3f1c1  -s ours

Change-Id: If30e083b58365ad922732fc86beaf2f03209cf88
parents f11e7041 7eb3f1c1
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment