| commit | b84133740a358ff41f7e50172403f233e1603e68 | [log] [tgz] |
|---|---|---|
| author | Andy Stadler <stadler@google.com> | Wed Feb 16 12:22:57 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 16 12:22:57 2011 -0800 |
| tree | be8627bf077eff1ce49c461e79d07037c5ccd453 | |
| parent | d5444802b7be29d385ad8a12d06b966aa940805f [diff] | |
| parent | 04ddff6905a72d0d39d791eaba33546fb66b15a6 [diff] |
am 04ddff69: am b1835085: Merge "@hide DPM global proxy settings" into honeycomb * commit '04ddff6905a72d0d39d791eaba33546fb66b15a6': @hide DPM global proxy settings