| commit | da8beef55612738d87d6aa520445377a9e4ae784 | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Mon Apr 04 15:25:45 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 04 15:25:45 2011 -0700 |
| tree | 75ef8fb3fa3dd373602e99dc3b03fdd1277d106f | |
| parent | 5851b8662dc95372d68df293cb13c59da0cf8582 [diff] | |
| parent | 37229514c56dac0c1e3cef6bc8229232d0c75b96 [diff] |
am 37229514: Merge "resolved conflicts for merge of 7544b23e to gingerbread-plus-aosp" into gingerbread-plus-aosp * commit '37229514c56dac0c1e3cef6bc8229232d0c75b96': Fix Default route after secondary net use.