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

Browse Source

Merge commit '4600139173c80db4ebfb70e2417231e9678d37f9'

* commit '4600139173c80db4ebfb70e2417231e9678d37f9':
  DO NOT MERGE Do not kill sockets going default->hipri

...

This commit is contained in:

Robert Greenwalt

2010-08-21 09:33:42 -07:00

committed by Android Git Automerger

parent 582ac3fa1e 4600139173

commit 39b6f999a4

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available