| commit | 198b24d59a48a4d87c08a1876f2b2aacc5490b42 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Mon Apr 04 16:44:25 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 04 16:44:25 2011 -0700 |
| tree | c6c49ccc2fcf459fc756f8044d40b6371c057318 | |
| parent | 1e2f286a2726b05cb76b4ea45c7867d4f6885831 [diff] | |
| parent | 18510113794df002ee288d8d5fdf8b64b4c957b5 [diff] |
am 18510113: resolved conflicts for merge of e00e35a5 to honeycomb-plus-aosp * commit '18510113794df002ee288d8d5fdf8b64b4c957b5': Only leave one default network up at a time.