tree 9799ffde4926129da9717b6ba18d96ec571cf019
parent b0210338bba812d27e0e6b1bb4b6b89405209a19
parent 113f2122662856f2482836f1b4c585a050888afa
author Lajos Molnar <lajos@google.com> 1399054002 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399054002 +0000

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

* commit '113f2122662856f2482836f1b4c585a050888afa':
  Smooth out AwesomePlayer