| commit | c954e61cd73875e74115c778cb5e35eab9695a59 | [log] [tgz] |
|---|---|---|
| author | Alan Viverette <alanv@google.com> | Thu Jun 05 21:00:32 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Jun 05 21:00:32 2014 +0000 |
| tree | ab3065d28516570d2847d6bc9206b67e97cdb576 | |
| parent | 70dbeacadcd2a8469ff7d451c570d8236cb96370 [diff] | |
| parent | 4586b0da631758e2753c3f0936f410ff3a6c3bda [diff] |
am 3966c960: Merge "Add defaults for caption colors and edge type" into lmp-preview-dev * commit '3966c9604e55c9183a6d1ba8b3540add3be4434f': Add defaults for caption colors and edge type