am 7b4c42fe: am f1cecce8: Merge change I4414f233 into eclair-mr2

Merge commit '7b4c42fe2be5c8c3b44f36297743b59396ff25ad'

* commit '7b4c42fe2be5c8c3b44f36297743b59396ff25ad':
  Remove references to com.google.android.gtalkservice.xml.