tree c5a922a844ec13a0a5c16c639ae0c309be17e8cd
parent 77654400c2519c66063da346967c013d6442453d
parent 4b54ad047aab846694cc1217d0edb6fef751e369
author Mike LeBeau <mlebeau@android.com> 1271428218 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271428218 -0700

am f04be52a: am 0c5ad4f1: Merge "For search suggestions in the search dialog, allow the \'title\' line of text to be up to 2 lines (rather than the usual 1) if no \'description\' line is provided." into froyo

Merge commit 'f04be52a382544ff8006e227c1578a219ba0f23e' into kraken

* commit 'f04be52a382544ff8006e227c1578a219ba0f23e':
  For search suggestions in the search dialog, allow the 'title'