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

Commit caa9aa08 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 0ce12e21: (-s ours) am e25a264c: Merge "DO NOT MERGE. Wifi service now... 

am 0ce12e21: (-s ours) am e25a264c: Merge "DO NOT MERGE.  Wifi service now blames apps for its wake lock use." into gingerbread

Merge commit '0ce12e21'

* commit '0ce12e21':
  DO NOT MERGE.  Wifi service now blames apps for its wake lock use.
parents fde5e965 0ce12e21
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