| commit | b46062bc0886eb176afe23b7dab81db3ab6c1beb | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Sat Jan 29 09:35:28 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Jan 29 09:35:28 2011 -0800 |
| tree | 918b40e671a8a72bc11e305361df875f8a2b8982 | |
| parent | f8f37d97ce108e12dd973de941de5185df500a9d [diff] | |
| parent | f8fdec50c7871b640c13cfe3e2e7a3b449f62f69 [diff] |
am f8fdec50: resolved conflicts for merge of aa3866e6 to honeycomb-plus-aosp * commit 'f8fdec50c7871b640c13cfe3e2e7a3b449f62f69': Add some network types that OEM's are asking for.