Merge branch 'readonly-p4-donut' into donut

author Andy Stadler <>

Fri, 10 Apr 2009 23:26:11 +0000 (16:26 -0700)

committer The Android Open Source Project <initial-contribution@android.com>

Fri, 10 Apr 2009 23:26:11 +0000 (16:26 -0700)
author Andy Stadler <>
Fri, 10 Apr 2009 23:26:11 +0000 (16:26 -0700)
committer The Android Open Source Project <initial-contribution@android.com>
Fri, 10 Apr 2009 23:26:11 +0000 (16:26 -0700)
diff --cc api/current.xml
Simple merge
diff --cc core/java/android/content/Intent.java
Simple merge
author	Andy Stadler <>
	Fri, 10 Apr 2009 23:26:11 +0000 (16:26 -0700)
committer	The Android Open Source Project <initial-contribution@android.com>
	Fri, 10 Apr 2009 23:26:11 +0000 (16:26 -0700)
		1	2
api/current.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/content/Intent.java	patch \|	diff1 \|	diff2 \|	blob \| history