tree e66adddcd25634631a49bc08b404702654b4f278
parent 6a0ed5ca8434b65a3fe8bf4a5f13a230e0e8502c
parent b09a6d08321b9484d80a2a9dc11ed52623942c8d
author Andy Hung <hunga@google.com> 1464204850 +0000
committer android-build-merger <android-build-merger@google.com> 1464204850 +0000

resolve merge conflicts of 5d8e380 to nyc-mr1-dev
am: b09a6d0832

* commit 'b09a6d08321b9484d80a2a9dc11ed52623942c8d':
  AudioTrack: Fix timestamp startup condition

Change-Id: Id2c883949a47daac936266310ebe4d69a5965eb3