beb55f572f
Merge commit '9f882c0b10ddbd436e24e51db8b1063bc5591d24' into gingerbread-plus-aosp * commit '9f882c0b10ddbd436e24e51db8b1063bc5591d24': Fix audio input sample timestamp when audio driver loses audio samples