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)

Trivial merge