| commit | 3e09c1a3c63b242b6d83671e8409f44d371cb9a3 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Fri Aug 30 14:38:20 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Aug 30 14:38:20 2013 -0700 |
| tree | 7b947dbe907abec74c0896e334438824759b5fbe | |
| parent | 3a9c7161dfd6f16baddd2eb209a013609b927da7 [diff] | |
| parent | 083199efed839274619eb7a003a7d7c9229e5ffc [diff] |
am 083199ef: Merge "Update captioning APIs" into klp-dev * commit '083199efed839274619eb7a003a7d7c9229e5ffc': Update captioning APIs