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

Skip to content
Commit ce220264 authored by Arne Coucheron's avatar Arne Coucheron
Browse files

Fixes and cleanups after 7.1.0/7.1.1 merge 

Fix some merge derps and sync code properly to upstream.
Also remove stray file that sneaked in after 7.1.1 merge.

Change-Id: Ifc93a58016e4e8b4f4d83f72281b306823474ef1
parent 07fb1fe8
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