OSDN Git Service

Merge "@hide DPM global proxy settings" into honeycomb
authorAndy Stadler <stadler@google.com>
Wed, 16 Feb 2011 20:18:39 +0000 (12:18 -0800)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 16 Feb 2011 20:18:39 +0000 (12:18 -0800)
commitb18350851633b1d3717f2484d27b76aa64788ce1
treecd831acfab3cae8575add710d6d6c4ea3462a70a
parentf722cecd182b909eae3dc6ec7f41900b53ba45c1
parentd26727273d16745ceddc2203121d29c3a9e7733c
Merge "@hide DPM global proxy settings" into honeycomb