tree 44b388579b5d5dc756f4eb55c8b286cc3b748aa1
parent 2770caafed91d05b0286b627d626820b3c236df4
parent 0068e00ddc625280ea230ca3fb819e901595c03d
author Jean-Michel Trivi <jmtrivi@google.com> 1366387212 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366387212 -0700

am 0068e00d: am 91695a0c: Merge "Anti-drift in RCC playback position" into jb-mr2-dev

* commit '0068e00ddc625280ea230ca3fb819e901595c03d':
  Anti-drift in RCC playback position