am 4d34b227: (-s ours) am 32d54b19: reconcile froyo-release into gingerbread

Merge commit '4d34b227b482b702b8640d7307cdb7358cd1c362'

* commit '4d34b227b482b702b8640d7307cdb7358cd1c362':
  Remove Search from the system Settings app DO NOT MERGE
This commit is contained in:
Jean-Baptiste Queru
2010-09-26 17:54:32 -07:00
committed by Android Git Automerger

Diff Content Not Available