tree 7ac44e860537f07e6cda1fd2188d01c54aadf496
parent e6bc23eb27e33cc5a544b5e443d71a42ef46ba96
parent ed75323e27cf9d593ef8c026be9e45438a370ebc
author Marco Nelissen <marcone@google.com> 1478540492 +0000
committer android-build-merger <android-build-merger@google.com> 1478540492 +0000

Merge "Use libaudio instead of libmedia" am: 9581957a57 am: 1cb6cefdb3
am: ed75323e27

Change-Id: I872e4afd6b43ec49b53622a113307941e2025817