tree d8b060f85946f9bc6fc0aff3cc1fddcfdfe50a83
parent 9adaabe78ac0245cb3e7554a8bbc5565bd002394
parent e5ee1dec2cb25a47b6193e752d4fc4c36022e3f0
author Alan Viverette <alanv@google.com> 1412183966 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1412183966 +0000

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

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