tree 4f27f75f54ab44f4f545f79d03f762a65dad0b86
parent 9a6cf150480f97a4d14f64c05a7353bc16b2c5db
parent 6373349836237abffc3de8a3632234170bc1cfca
author Dave Sparks <davidsparks@android.com> 1256805851 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1256805851 -0700

am 63733498: am 98de26e0: Merge change I8cc42c52 into eclair

Merge commit '6373349836237abffc3de8a3632234170bc1cfca' into eclair-mr2-plus-aosp

* commit '6373349836237abffc3de8a3632234170bc1cfca':
  Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.