tree b5de50f5e4f175762e35831fd3f20347492b7d20
parent 6e76fda36a87e154397de816fa091b721a4c11bd
parent b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb
author Lajos Molnar <lajos@google.com> 1399053476 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399053476 +0000

am b52675e9: Merge "Smooth out AwesomePlayer"

* commit 'b52675e9e3b2cfd7ca3ec4eda80dde77dee9dafb':
  Smooth out AwesomePlayer