Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 70e64d78 authored by Fred Quintana's avatar Fred Quintana Committed by Android Git Automerger
Browse files

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
parents e7a3350e 7c4ed450
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment