tree 28aae03ab6084bba9d21fe0fd7667701a9319d26
parent eb659ee3b4603777b38e04b593a51f6fb349a477
parent 999a1ca984ec0877c795433e6f1baa6cd5853aac
author Alan Viverette <alanv@google.com> 1412183466 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412183466 +0000

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

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