| commit | f4af360d11aa9f63710e60af0c24e6804c38c1a6 | [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 | 9e6efa730f6809bd12f2bed0f686de6757ba5ffa | |
| parent | 691a02566ff29c66b54088f5bfd2a145d1b7fd1a [diff] | |
| parent | e9e3d1dec208546ac145022b6a1d11f5a55e9973 [diff] |
am e716a551: resolved conflicts for merge of ab2194aa to honeycomb-plus-aosp * commit 'e716a5515bfb9d9f1f8a5b87fee8b75bef3a1a96': Only leave one default network up at a time.