| commit | 12a8a59e7af41b61f628040c3fa64c8faa290246 | [log] [tgz] |
|---|---|---|
| author | Fred Quintana <fredq@google.com> | Thu Nov 05 14:12:16 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 05 14:12:16 2009 -0800 |
| tree | 5e325fe449d82181b30c0f620ebd1f1a145d171d | |
| parent | 9e50993c844faaac8c49c4da209a0a14807c4c6c [diff] | |
| parent | 0fb041f364355c438eb7d508eb7fa7946418cd11 [diff] |
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