tree 5e325fe449d82181b30c0f620ebd1f1a145d171d
parent 9e50993c844faaac8c49c4da209a0a14807c4c6c
parent 0fb041f364355c438eb7d508eb7fa7946418cd11
author Fred Quintana <fredq@google.com> 1257459136 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257459136 -0800

am 0fb041f3: am 3266c5f1: resolved conflicts for merge of f476c480 to eclair-mr2

Merge commit '0fb041f364355c438eb7d508eb7fa7946418cd11'

* commit '0fb041f364355c438eb7d508eb7fa7946418cd11':
  remove the SubscribedFeedsProvider since it has been moved to vendor/google