OSDN Git Service

Merge "Convert libmedia_jni to Android.bp" am: 85faffa7ef am: 162d19f590 am: 7eb3f1c1...
authorColin Cross <ccross@android.com>
Wed, 17 May 2017 18:24:48 +0000 (18:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 May 2017 18:24:48 +0000 (18:24 +0000)
commit83c0629ad86390f81bdac5142430d74360978263
treee922fc31a54c80e8fb89f763d9953c34530af332
parent45a9b4c74827afa4bdae6afd7701791ddd2a5216
parent694d49266419f7eaa9867e2dff0ac43c90a99e3d
Merge "Convert libmedia_jni to Android.bp" am: 85faffa7ef am: 162d19f590 am: 7eb3f1c1c4  -s ours
am: 694d492664  -s ours

Change-Id: Ic798c8f3473405a0fac8306c1ab7db89f2604efb