OSDN Git Service

Merge "Convert libmedia_jni to Android.bp" into oc-dev-plus-aosp
authorColin Cross <ccross@android.com>
Wed, 17 May 2017 15:25:11 +0000 (15:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 17 May 2017 15:25:11 +0000 (15:25 +0000)
commitb1ea1b08233cd5622b075f9ea15f84d22bd8e857
tree8fdffb14734bf5a41a393756fc764bc42b0b22ab
parentf0606b8e3616093783ea2bc542bd6f344a04df3e
parentdcf929fd425d38035cb2cbb61b6c874c57632682
Merge "Convert libmedia_jni to Android.bp" into oc-dev-plus-aosp
am: dcf929fd42  -s ours

Change-Id: Idc3579eee2e9b97b69fe8d8244a1edd67e575bcc