| commit | e9b1ce361532f3bf974498833cafaa3808666704 | [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 | 2de34eaf949bd30904e7e7343a64fce86fec4561 | |
| parent | 82170c428615d899a2f40cf74fd80b71b92b2d87 [diff] | |
| parent | b81ccee06fe43101eabd0a25ca3825b4e88a866e [diff] |
am b1835085: Merge "@hide DPM global proxy settings" into honeycomb * commit 'b18350851633b1d3717f2484d27b76aa64788ce1': @hide DPM global proxy settings