Merge "More multi-user stuff." into jb-mr1-dev

author Dianne Hackborn <hackbod@google.com>

Sun, 16 Sep 2012 07:05:45 +0000 (00:05 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Sun, 16 Sep 2012 07:05:46 +0000 (00:05 -0700)
author Dianne Hackborn <hackbod@google.com>
Sun, 16 Sep 2012 07:05:45 +0000 (00:05 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Sun, 16 Sep 2012 07:05:46 +0000 (00:05 -0700)
diff --cc api/current.txt
Simple merge
diff --cc core/java/android/content/Intent.java
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Sun, 16 Sep 2012 07:05:45 +0000 (00:05 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sun, 16 Sep 2012 07:05:46 +0000 (00:05 -0700)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/content/Intent.java	patch \|	diff1 \|	diff2 \|	blob \| history