tree 11f8597dadc9175f13573e99c1c2e461a7af3235
parent a70f45478c1ff89a85d29dfda95e6082d67a4816
parent 7cc5910c89ef2e643e91c00e88f0d325e205c273
author Chiao Cheng <chiaocheng@google.com> 1384394052 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384394052 -0800

am 7cc5910c: am e07ad7c9: Merge "Make fonts and colors consistent across views." into klp-dev

* commit '7cc5910c89ef2e643e91c00e88f0d325e205c273':
  Make fonts and colors consistent across views.