am b59997f7: Merge "Properly reset the number of frames we think we\'ve written to the audio sink"
am b59997f7: Merge "Properly reset the number of frames we think we\'ve written to the audio sink"

* commit 'b59997f7cea7f381cba0803ecf7c6f93c935b850':
  Properly reset the number of frames we think we've written to the audio sink

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base