tree 14932a87458bbc9f1488a977ea1a1a31539b22af
parent 6393deaf98fa2895f8c2ae5081fbba0fe75ae80b
parent 27c4c1f6b0a34f32e53db244f5d402c89bde3221
author James Dong <jdong@google.com> 1284587738 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1284587738 -0700

am 9f882c0b: Merge "Fix audio input sample timestamp when audio driver loses audio samples" into gingerbread

Merge commit '9f882c0b10ddbd436e24e51db8b1063bc5591d24' into gingerbread-plus-aosp

* commit '9f882c0b10ddbd436e24e51db8b1063bc5591d24':
  Fix audio input sample timestamp when audio driver loses audio samples