am e0de5bff: Merge "Fire "dreaming started" and "dreaming stopped" broadcasts." into...

author John Spurlock <jspurlock@google.com>

Thu, 20 Sep 2012 13:24:20 +0000 (06:24 -0700)

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

Thu, 20 Sep 2012 13:24:20 +0000 (06:24 -0700)
author John Spurlock <jspurlock@google.com>
Thu, 20 Sep 2012 13:24:20 +0000 (06:24 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Thu, 20 Sep 2012 13:24:20 +0000 (06:24 -0700)
diff --cc api/current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
author	John Spurlock <jspurlock@google.com>
	Thu, 20 Sep 2012 13:24:20 +0000 (06:24 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Thu, 20 Sep 2012 13:24:20 +0000 (06:24 -0700)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history