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

Skip to content
Commit 8ff8a2d0 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of 8fc378f9 to gingerbread-plus-aosp 

Change-Id: I938c0a66ad4271b33626d6b12406a2f6c6d1b6d8
parents ae1f9dce 3bffa052
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