OSDN Git Service

am 9bbc490e: am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext...
authorMarco Nelissen <marcone@google.com>
Fri, 4 Sep 2015 16:16:31 +0000 (16:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Sep 2015 16:16:31 +0000 (16:16 +0000)
commit2cec2b4c179b1a946b6f745a8404bf1ee70f825c
tree259d14e2cfe4deda9dafab3066493799497ebfe6
parent933fd689b5511f096b864b84c95855d691d06a73
parent9bbc490e17d38a9734a2b95a308100a7d0ec6dcd
am 9bbc490e: am facd279e: am 7d34959b: am 16e12007: am 74888428: Merge "Fix timedtext parsing" into klp-dev

* commit '9bbc490e17d38a9734a2b95a308100a7d0ec6dcd':
  Fix timedtext parsing