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

Commit 39b6f999 authored by Robert Greenwalt's avatar Robert Greenwalt Committed by Android Git Automerger
Browse files

am 46001391: (-s ours) am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets... 

am 46001391: (-s ours) am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread

Merge commit '46001391'

* commit '46001391':
  DO NOT MERGE Do not kill sockets going default->hipri
parents 582ac3fa 46001391
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