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

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

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

Merge commit '8059bcbfa71c8233e616304843d9280f5f1615bb' into eclair-mr2-plus-aosp

* commit '8059bcbfa71c8233e616304843d9280f5f1615bb':
  Let RemoteViews nest children, allow ViewFlipper.
parents 17be9f5c 074870af
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