commit | 083199efed839274619eb7a003a7d7c9229e5ffc | [log] [tgz] |
---|---|---|
author | Alan Viverette <alanv@google.com> | Fri Aug 30 21:34:42 2013 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Aug 30 21:34:43 2013 +0000 |
tree | af1371b84386e9761028d0fbf7dad6feec0965cf | |
parent | 6627e5b2aef2783cfa505a48195d7b8153eda25c [diff] | |
parent | 69ce69b0e1500bcf0bfa87eaf0b89ae47f552f5c [diff] |
Merge "Update captioning APIs" into klp-dev