Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03805f72 authored Aug 18, 2010 by Brian Carlstrom Committed by Android Git Automerger Aug 18, 2010

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

Merge commit 'd313cab4' into gingerbread-plus-aosp

* commit 'd313cab4':
  tracking merge of external/apache-http from dalvik-dev

parents a2527055 d313cab4

api/9.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"

api/current.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -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"