tree be17dd933f068245a55b6d2e27b263f99ebec315
parent f421d608244bc474f645b14a639ae0560a333f64
parent 85faffa7efeea759ae8afb487716b2ad97af2838
author Colin Cross <ccross@android.com> 1495034969 +0000
committer android-build-merger <android-build-merger@google.com> 1495034969 +0000

Merge "Convert libmedia_jni to Android.bp"
am: 85faffa7ef

Change-Id: I7afbf6dda3dab6a3c36576e2c118b1accdcc2a17