OSDN Git Service

am 3266c5f1: resolved conflicts for merge of f476c480 to eclair-mr2
authorFred Quintana <fredq@google.com>
Thu, 5 Nov 2009 22:01:44 +0000 (14:01 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 5 Nov 2009 22:01:44 +0000 (14:01 -0800)
commit0fb041f364355c438eb7d508eb7fa7946418cd11
tree15569d924e068cebce1f64ff47d6ef06d6fb67d3
parent990179755525d01a7e005182d8ec04722c7fd396
parent3266c5f125be34aae0f50e0e3397b14d9a603ad0
am 3266c5f1: resolved conflicts for merge of f476c480 to eclair-mr2

Merge commit '3266c5f125be34aae0f50e0e3397b14d9a603ad0' into eclair-mr2-plus-aosp

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