tree 7678a22be53c468d4e6eb188bbb7e93a55e8a716
parent 6f47b05bfc93f65e07379788c7a8db9109f5ea5e
parent f85e7df34cddec548f61a387841b9d051e2c099f
author Nancy Chen <nancychen@google.com> 1418065987 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418065987 +0000

am f85e7df3: am 40e3c80d: Merge "Expand search bar text to vertically fit on small devices." into lmp-mr1-dev

* commit 'f85e7df34cddec548f61a387841b9d051e2c099f':
  Expand search bar text to vertically fit on small devices.