OSDN Git Service

Merge "Update captioning settings to match revised API" into klp-dev
authorAlan Viverette <alanv@google.com>
Fri, 30 Aug 2013 21:35:04 +0000 (21:35 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 30 Aug 2013 21:35:04 +0000 (21:35 +0000)

Trivial merge