am 8d962613: am 6dba0680: Merge change I9589f9c2 into eclair-mr2

Merge commit '8d962613464b206f4c0b2323607c5e248543ad24'

* commit '8d962613464b206f4c0b2323607c5e248543ad24':
  Move android.server.search.SearchableInfo to android.app