tree 2b122ab2ba21183899c9720964f68afc68ade227
parent f8398cd07981d3e708c4f134059b2328fc49471a
parent f8cf084c543dd5d12ec812f48296313403579655
author Matt Pietal <mpietal@google.com> 1581704750 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1581704750 +0000

Merge changes I179b9b3a,I705648c9

* changes:
  Controls UI - Theme + color alignment
  Controls UI - Support thumbnail template