OSDN Git Service

am 28580b4d: Remove Search from the system Settings app DO NOT MERGE
authorBjorn Bringert <bringert@android.com>
Tue, 21 Sep 2010 10:05:25 +0000 (03:05 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 21 Sep 2010 10:05:25 +0000 (03:05 -0700)
commite2b102de6723b06d26dd5df986884881f72335ea
tree5232ab32ced8d7258ad1295ea5c6cf30083ac007
parent7cad4e2c88949b8fffc3cb85de3bbf01f9749cbb
parent28580b4d9a36bb15e75423bc95747b9a746ea8b9
am 28580b4d: Remove Search from the system Settings app DO NOT MERGE

Merge commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9' into gingerbread-plus-aosp

* commit '28580b4d9a36bb15e75423bc95747b9a746ea8b9':
  Remove Search from the system Settings app DO NOT MERGE
res/xml/settings.xml
src/com/android/settings/Settings.java