am d313cab4: Merge "tracking merge of external/apache-http from dalvik-dev" into gingerbread

Merge commit 'd313cab46e07c40f4cd1a94304a553e7eb809190' into gingerbread-plus-aosp

* commit 'd313cab46e07c40f4cd1a94304a553e7eb809190':
  tracking merge of external/apache-http from dalvik-dev
This commit is contained in:
Brian Carlstrom
2010-08-18 13:39:15 -07:00
committed by Android Git Automerger
2 changed files with 2 additions and 2 deletions

View File

@@ -379555,7 +379555,7 @@
type="java.lang.String"
transient="false"
volatile="false"
value=""100-Continue""
value=""100-continue""
static="true"
final="true"
deprecated="not deprecated"

View File

@@ -403649,7 +403649,7 @@
type="java.lang.String"
transient="false"
volatile="false"
value=""100-Continue""
value=""100-continue""
static="true"
final="true"
deprecated="not deprecated"