Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 81b68b65 authored by Mohan Kumar's avatar Mohan Kumar Committed by android-build-merger
Browse files

resolve merge conflicts of c73c64a6 to nyc-dev-plus-aosp 

am: e5bd62ba

* commit 'e5bd62ba':
  audioflinger: clear mMixerBuffer if frame is not ready
parents 638d4c21 e5bd62ba
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment