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
Loading
Please register or sign in to comment