am 32d54b19: reconcile froyo-release into gingerbread

Merge commit '32d54b19367505547a67c2b717047fdab375db94' into gingerbread-plus-aosp

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

Diff Content Not Available