tree 25795a984db9fced05db81360e9d1949af3b1a93
parent cf2b684f97b3cec9f9f57b31697c167b0e35c203
parent e5bed12bc2c1fede6b7f2db22d4432f4473c3232
author Alan Viverette <alanv@google.com> 1412176558 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412176558 +0000

am e5bed12b: am c2379e00: Merge "Add activated text colors, update Material preference header" into lmp-dev

* commit 'e5bed12bc2c1fede6b7f2db22d4432f4473c3232':
  Add activated text colors, update Material preference header