am 418d1df7: (-s ours) am 85c37e78: am c0f79432: Merge "Update captioning settings to match final design" into klp-dev

Browse Source

* commit '418d1df7272f6ed9c332d4683205306ebeb7c731':

...

This commit is contained in:

Alan Viverette

2013-12-05 22:45:23 +00:00

committed by Android Git Automerger

parent edd5e0fade 418d1df727

commit 046e61eb13

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available