diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-08-21 09:33:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-21 09:33:42 -0700 |
| commit | 39b6f999a4806d2496a3a9d50f034fdf4cabefc5 (patch) | |
| tree | ebb825c364b2a1bed7c86bfa52293329f4b72c35 /docs/html/sdk/api_diff/5/changes | |
| parent | 582ac3fa1ec77cba90381f82c5ca118c91a21002 (diff) | |
| parent | 4600139173c80db4ebfb70e2417231e9678d37f9 (diff) | |
am 46001391: (-s ours) am 6b2c56a2: Merge "DO NOT MERGE Do not kill sockets going default->hipri" into gingerbread
Merge commit '4600139173c80db4ebfb70e2417231e9678d37f9'
* commit '4600139173c80db4ebfb70e2417231e9678d37f9':
DO NOT MERGE Do not kill sockets going default->hipri
Diffstat (limited to 'docs/html/sdk/api_diff/5/changes')
0 files changed, 0 insertions, 0 deletions