OSDN Git Service

Merge "Update captioning settings to match final design" into klp-dev
authorAlan Viverette <alanv@google.com>
Fri, 9 Aug 2013 19:11:25 +0000 (19:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 9 Aug 2013 19:11:25 +0000 (19:11 +0000)
1  2 
res/values/strings.xml

Simple merge