tree 2d15c7942d53a68b4a226a874873dd8a258b5736
parent 8265f2b5cccbea6db3f5b84182bf95ee513e4f0b
parent 7b0e5146eef88ea22ab94934edf46f09a89d6803
author Steven Moreland <smoreland@google.com> 1491618852 +0000
committer android-build-merger <android-build-merger@google.com> 1491618852 +0000

Merge "libmediautils: mk -> bp" into oc-dev
am: 7b0e5146ee

Change-Id: I0da3beee8bf86cb960dcfb9306dc2d5580a91553