summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChiao Cheng <chiaocheng@google.com>2014-05-13 19:31:01 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-13 19:31:01 +0000
commitc1cc824e720565f79d233dca662c1e2f37c1e42a (patch)
tree817a484b55539c09dd4c441f80c0816b3446e71a
parent76a401e1cc77f2e074154e8c72d0b75b6d82dd85 (diff)
parent4a7203ade6cee072e2f1d204882d3cb8dac1d39a (diff)
am 4a7203ad: am 12bc8488: am e5e1544c: am 7cc5910c: am e07ad7c9: Merge "Make fonts and colors consistent across views." into klp-dev
* commit '4a7203ade6cee072e2f1d204882d3cb8dac1d39a':
0 files changed, 0 insertions, 0 deletions