OSDN Git Service

Merge "Merge: Load and apply proxy settings from config file in UpdateNoWindow, allow...
authorRaphaël Moll <ralf@android.com>
Mon, 10 Jan 2011 18:51:32 +0000 (10:51 -0800)
committerAndroid Code Review <code-review@android.com>
Mon, 10 Jan 2011 18:51:32 +0000 (10:51 -0800)

Trivial merge