tree ec3221fbbb9a4c296b96efb5c96cff9a96f6ea05
parent abc5be39aa3566e113c2a1d2b81fe0b1ecd6bd80
parent 23f4ff1d652c1d1a03ad3b87e9ed29f610ef4b2d
author Colin Cross <ccross@android.com> 1493909950 +0000
committer android-build-merger <android-build-merger@google.com> 1493909950 +0000

Merge "Convert libmedia to Android.bp"
am: 23f4ff1d65

Change-Id: Ic609d797b7e067f2e5686d0c38958badc9561ad1