From: Bjorn Bringert <bringert@android.com>
Date: Mon, 20 Sep 2010 19:48:11 +0000 (-0700)
Subject: am f4d359d3: (-s ours) Remove Search from the system Settings app DO NOT MERGE
X-Git-Tag: android-x86-4.4-r1~2043^2~103
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8fdaff05d1154c93b467b9647b8fc2702eca1699;p=android-x86%2Fpackages-apps-Settings.git

am f4d359d3: (-s ours) Remove Search from the system Settings app DO NOT MERGE

Merge commit 'f4d359d3c83d0e84319603ecc0f4dce120708612' into gingerbread

* commit 'f4d359d3c83d0e84319603ecc0f4dce120708612':
  Remove Search from the system Settings app DO NOT MERGE
---

8fdaff05d1154c93b467b9647b8fc2702eca1699