tree e0e15724deeadb53d5bec3968ed631880658f5a9
parent 9e0922ba7dda72fc94d2af2872cfc630ad599c91
parent 5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5
author Lajos Molnar <lajos@google.com> 1399053644 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399053644 +0000

am 5fa3f7af: am b52675e9: Merge "Smooth out AwesomePlayer"

* commit '5fa3f7afc0d8d4978d0192cd2cf67ed3899d4dd5':
  Smooth out AwesomePlayer