tree c372ea81126db57c32abfafbaba8a94275ca69c2
parent 68a4203ed859d3f4789f1805d0590255827046c4
parent 2e09c0ba8a11ee629a85582413598c60cca09e8e
author Marco Nelissen <marcone@google.com> 1478541612 +0000
committer android-build-merger <android-build-merger@google.com> 1478541612 +0000

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

Change-Id: Ib4d969c42e1ee7d3992a3a725b27d826c4b0d31e