OSDN Git Service

Merge "Convert libmedia_jni to Android.bp" am: 85faffa7ef am: 162d19f590
authorColin Cross <ccross@android.com>
Wed, 17 May 2017 17:43:19 +0000 (17:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 May 2017 17:43:19 +0000 (17:43 +0000)
commit694d49266419f7eaa9867e2dff0ac43c90a99e3d
treec03d52df2099c5acdbbb1a40ddaef5a41a59ba28
parentf11e70418c92a9fbec0d0685e4dc4c2e5aee2352
parent7eb3f1c1c439493fd3af59d7281e70693e0c83f5
Merge "Convert libmedia_jni to Android.bp" am: 85faffa7ef am: 162d19f590
am: 7eb3f1c1c4  -s ours

Change-Id: If30e083b58365ad922732fc86beaf2f03209cf88