tree ec648667618d6041c914c5609080ae3ce5f526bd
parent 1b36f893faf718411f9fe17e7f161e1339973199
parent 943b38fbb950a66fbaf51b97ad73b552e121a13b
author Christopher Lane <lanechr@google.com> 1415925936 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415925936 +0000

am 943b38fb: am 1092539b: Replace font size customization with a max width for the welcome message

* commit '943b38fbb950a66fbaf51b97ad73b552e121a13b':
  Replace font size customization with a max width for the welcome message