| commit | c4fa3a727bb66e36ba0a321e5c3273c09583c341 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Fri Mar 14 10:02:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 14 10:02:45 2014 +0000 |
| tree | 1b252b6495e62dae7a3210cfbc19b2c41c13d41f | |
| parent | 7e71c1ea12aecc0706f118aff9067d410034c229 [diff] | |
| parent | 0fa90474e0ee085051d9ba155705b7f5d3bc7bfa [diff] |
am 0fa90474: (-s ours) am 3782a3a6: am 42972075: am 0100a310: am 8840aa4c: Merge "DO NOT MERGE Add preference for caption text opacity" into klp-dev * commit '0fa90474e0ee085051d9ba155705b7f5d3bc7bfa': DO NOT MERGE Add preference for caption text opacity