commit | 9319fc55df0567f13af6207feb4a828bb90adcdd | [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 | 2aa2cb6936c908494527967d2b865eaf6392b787 | |
parent | bb58f515bac17f0dda881f006d9f5404ca36c116 [diff] | |
parent | eaea127a8bc91882b904763a226a92835bf9e8d9 [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.