am 1d733625: am cca2f2f9: Merge "Send out a broadcast that the system is being factor...

author Jason parks <jparks@google.com>

Mon, 4 Apr 2011 23:43:34 +0000 (16:43 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Mon, 4 Apr 2011 23:43:34 +0000 (16:43 -0700)
author Jason parks <jparks@google.com>
Mon, 4 Apr 2011 23:43:34 +0000 (16:43 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Mon, 4 Apr 2011 23:43:34 +0000 (16:43 -0700)
diff --cc core/java/android/os/RecoverySystem.java
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
author	Jason parks <jparks@google.com>
	Mon, 4 Apr 2011 23:43:34 +0000 (16:43 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Mon, 4 Apr 2011 23:43:34 +0000 (16:43 -0700)
		1	2
core/java/android/os/RecoverySystem.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history