am 5fee638e: am f04be52a: am 0c5ad4f1: Merge "For search suggestions in the...

am 5fee638e: 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