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

Skip to content
Commit fbab7f32 authored by Matt Garnes's avatar Matt Garnes
Browse files

Merge remote-tracking branch 'caf/LA.BR.1.2.3' into caf/cm-12.1 

Conflicts:
	res/layout/action_mode.xml

Change-Id: Id4005a098134f089e904ed090acec7ca6f786ad1
parents 3fcec525 725da2fb
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment