| commit | d82fa0d3c8100ac98a9b73eeeb630353c2d9ec68 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Tue Sep 16 23:30:03 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 23:30:03 2014 +0000 |
| tree | d9e1680040fc2b8796e3bcef9c1e61efab5d8d55 | |
| parent | d1df07897e34347b59cc372142f90103a49a8693 [diff] | |
| parent | 96f26b8039b5993a086d292a2fe819dd2cf2d637 [diff] |
am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev * commit '37cbd74ad6dc3c7639e2ce8200ca40a2acc275ef': Ensure we always have valid colors in CaptionStyle