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

Skip to content
Commit 71f72c37 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 3719f856: (-s ours) DO NOT MERGE resolved conflicts for merge of 8c11e952... 

am 3719f856: (-s ours) DO NOT MERGE resolved conflicts for merge of 8c11e952 to gingerbread-plus-aosp

Merge commit '3719f856'

* commit '3719f856':
  DO NOT MERGE WifiLock extensions for high performance mode
parents bd1355db 3719f856
Show 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