tree bbf52f1eb8428c0d1f30b28219a6b19f4df4ef62
parent 585549bc13dc03859d39f92f13e9da5e583b2d28
parent 94a68ecf2b56bd56994d0352cbaad56e58dcf0dc
author James Dong <jdong@google.com> 1348503976 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348503976 -0700

am 94a68ecf: Merge "Bug fix: MediaPlayer\'s deselectTrack() for subtitle." into jb-mr1-dev

* commit '94a68ecf2b56bd56994d0352cbaad56e58dcf0dc':
  Bug fix: MediaPlayer's deselectTrack() for subtitle.