| commit | ae1bd2027449da0f8f6563adaaa8690e60f7da43 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Tue Sep 16 23:42:51 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 16 23:42:51 2014 +0000 |
| tree | fac9c8de17b398edd6476e3bb1a77760aec62160 | |
| parent | 7085d44c31b7c37986532f76247f40db01326212 [diff] | |
| parent | d82fa0d3c8100ac98a9b73eeeb630353c2d9ec68 [diff] |
am f335590a: am 37cbd74a: Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev * commit 'f335590ac08e1bfa9f38e21c1157c8fc1799a5d9': Ensure we always have valid colors in CaptionStyle