Merge change I9589f9c2 into eclair-mr2

* changes:
  Move android.server.search.SearchableInfo to android.app