tree 7398ce098972c895ad9838a3047e8844d8d9d6d6
parent 7f74221708929f518bc1d68cef666c194a88bc79
parent 27431de020e535c31365884316f656bc60b4fe4f
author James Dong <jdong@google.com> 1335853240 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335853240 -0700

am 27431de0: Merge "Fix a bug on subtitle (SRT)." into jb-dev

* commit '27431de020e535c31365884316f656bc60b4fe4f':
  Fix a bug on subtitle (SRT).