| commit | b6c5d824c0eb34c218d18982c51b69c2df198220 | [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 | 821ea415fb80c7e3b55b81594c0e301a646cfbdb | |
| parent | b76bcc07d859d1903501c13efd217d1c5be0b9dd [diff] | |
| parent | e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96 [diff] |
am e716a551: resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp * commit 'e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96': Only leave one default network up at a time.