tree 2ce468c14b9fb9f036cb2b01aeb50d002358b3ef
parent ff0fcb2628613953f454875006bfb78c3fc087d3
parent fc42e16d96b7e1b18b573f40df1319c56f8ab933
author James Dong <jdong@google.com> 1339780594 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1339780594 -0700

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

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