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

Skip to content
Commit 8a4348bb authored by Andy Hung's avatar Andy Hung Committed by android-build-merger
Browse files

resolve merge conflicts of 5d8e3808 to nyc-mr1-dev am: b09a6d08 

am: 6b0a8693

* commit '6b0a8693':
  AudioTrack: Fix timestamp startup condition

Change-Id: Ie11abf463d4ca8b065fffc66bfb1c4db37a3ca4c
parents 96e9bfd9 6b0a8693
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