tree 92cbb9d3d322db8586389a60648c8509979f7372
parent 1494f8671ef6d9e6f14fb18b2248eecc37d0dcfc
parent e88aee8ad85b01229b12dbc0c3cc2f0b8b490192
author Alan Viverette <alanv@google.com> 1402000641 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1402000642 +0000

Merge "Add defaults for caption colors and edge type" into lmp-preview-dev