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

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

Change-Id: I7687c3933303c57418a9b7797d995ae7f955ead2