am 85c37e78: am c0f79432: Merge "Update captioning settings to match final design" into klp-dev

* commit '85c37e78b5bb21788ce3edb42363e550895cd9fc':
This commit is contained in:
Alan Viverette
2013-12-05 19:40:12 +00:00
committed by Android Git Automerger

Diff Content Not Available