| commit | 266cd13b238aa2742bb5b0521ebe05bc09e3e061 | [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 | 917c047492036f03e0e53bc5bf25be02650aaf95 | |
| parent | d64d21ce274ed3ce8e45f2e2be53c9cff413b4b5 [diff] | |
| parent | e9b1ce361532f3bf974498833cafaa3808666704 [diff] |
am 04ddff69: am b1835085: Merge "@hide DPM global proxy settings" into honeycomb * commit '04ddff6905a72d0d39d791eaba33546fb66b15a6': @hide DPM global proxy settings