tree b183c5b367584bee34df08f2d521c55312f6b472
parent 48f91ce1dbef883c11fa608d76aa38eebc427732
parent cb013629eaac7fa42a5b1e2f9b6b10af87851909
author Andreas Huber <andih@google.com> 1337107066 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337107066 -0700

am cb013629: am dfa29ab1: Merge "Smoothen audio "real" time by compensating with system_time()" into jb-dev

* commit 'cb013629eaac7fa42a5b1e2f9b6b10af87851909':
  Smoothen audio "real" time by compensating with system_time()