commit | 96f26b8039b5993a086d292a2fe819dd2cf2d637 | [log] [tgz] |
---|---|---|
author | Alan Viverette <alanv@google.com> | Tue Sep 16 23:20:27 2014 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Sep 16 23:20:28 2014 +0000 |
tree | 58c8b6b697dc32fdc05c7cbba8eeb86abadcac8b | |
parent | f74879fb4dcb4926367a3a890a40bec30430056a [diff] | |
parent | f1820064d9cfcf43e4cfd16872acca3bf5a7d94b [diff] |
Merge "Ensure we always have valid colors in CaptionStyle" into lmp-dev