tree 90c0f01f5ddfb353e36c735b3c4829523de8b566
parent 4bb2253be6855ab2446fe2344a8a57487e3f5024
parent fbb26f5101d9ef14251d561dba37f87d001fbbf6
author James Dong <jdong@google.com> 1339780762 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339780762 -0700

am fbb26f51: am fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-dev

* commit 'fbb26f5101d9ef14251d561dba37f87d001fbbf6':
  Fix track selection code in AwesomePlayer