| commit | b81ccee06fe43101eabd0a25ca3825b4e88a866e | [log] [tgz] |
|---|---|---|
| author | Andy Stadler <stadler@google.com> | Wed Feb 16 12:18:39 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Feb 16 12:18:39 2011 -0800 |
| tree | 57e92b570d2b28ff782508acd34ed6063afe0e4b | |
| parent | ea66537c1709ba2c1547e092c0fff6323ce4ce9e [diff] | |
| parent | 89ddb29cc4848f02c70c84fcae9b69bf869a2a82 [diff] |
Merge "@hide DPM global proxy settings" into honeycomb