tree a65aa711efb5a3635f512d5c3542c2cd1e5c4bbc
parent b69878456aef15f2c24a3df3437e2180427a6eef
parent 569a78d816d9ac6ae750819bc51b31b51e9d22ae
author Mikhail Naganov <mnaganov@google.com> 1560204147 -0700
committer android-build-merger <android-build-merger@google.com> 1560204147 -0700

[automerger skipped] Merge "audioserver: Remove direct dependency on IAudioRecord.aidl" am: 39ec5a7acc am: e57ca41a04 -s ours am: 909d9505e6 -s ours
am: 569a78d816 -s ours
am skip reason: change_id If165768e9097d1c95980883f1fe6e1aacae97506 with SHA1 464cf2be50 is in history

Change-Id: I7d8d2bbabe22672eff3618619e339ffa9b21edcc