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

Skip to content
Commit 8484e57f authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

resolved conflicts for merge of e4ae7fc3 to gingerbread-plus-aosp 

Change-Id: I2e0a0ed622bc4c32d79936b30ebbf9068b3bdee8
parents 6bdd6937 e4ae7fc3
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