am c055f869: am 7db7e6a0: Merge change I17f45d35 into eclair

Merge commit 'c055f869867be98c9a4f2ca5e1532c007a8d1998'

* commit 'c055f869867be98c9a4f2ca5e1532c007a8d1998':
  Unhide SearchManager.SUGGEST_PARAMETER_LIMIT