OSDN Git Service

Merge "Merge: Set 'https' proxy system properties using the 'http' settings, allowing...
authorRaphaël Moll <ralf@android.com>
Mon, 10 Jan 2011 18:51:22 +0000 (10:51 -0800)
committerAndroid Code Review <code-review@android.com>
Mon, 10 Jan 2011 18:51:22 +0000 (10:51 -0800)

Trivial merge