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

Skip to content
Commit b5dec27e authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android Git Automerger
Browse files

am 35d85700: am 8059bcbf: resolved conflicts for merge of 1162fd77 to eclair-mr2 

Merge commit '35d857002dcbc24d05a0f9d157ce8ee1927ae235'

* commit '35d857002dcbc24d05a0f9d157ce8ee1927ae235':
  Let RemoteViews nest children, allow ViewFlipper.
parents 85a53c09 43200076
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