| commit | 04ddff6905a72d0d39d791eaba33546fb66b15a6 | [log] [tgz] |
|---|---|---|
| author | Andy Stadler <stadler@google.com> | Wed Feb 16 12:20:36 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 16 12:20:36 2011 -0800 |
| tree | 3512399328c6b844076b50e868a80b990de08677 | |
| parent | 153cebee2432a931773130bffa20e72a982c0107 [diff] | |
| parent | b18350851633b1d3717f2484d27b76aa64788ce1 [diff] |
am b1835085: Merge "@hide DPM global proxy settings" into honeycomb * commit 'b18350851633b1d3717f2484d27b76aa64788ce1': @hide DPM global proxy settings