am 6dba0680: Merge change I9589f9c2 into eclair-mr2

Merge commit '6dba0680cd3bc0bd987a3d01fc49421897528f20' into eclair-mr2-plus-aosp

* commit '6dba0680cd3bc0bd987a3d01fc49421897528f20':
  Move android.server.search.SearchableInfo to android.app