Merge "Add hidden API startActivityForResultAsUser" into oc-dev

author TreeHugger Robot <treehugger-gerrit@google.com>

Thu, 13 Apr 2017 12:13:00 +0000 (12:13 +0000)

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

Thu, 13 Apr 2017 12:13:03 +0000 (12:13 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Thu, 13 Apr 2017 12:13:00 +0000 (12:13 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 13 Apr 2017 12:13:03 +0000 (12:13 +0000)
diff --cc core/java/android/app/Activity.java
Simple merge
diff --cc core/java/android/app/Fragment.java
Simple merge
diff --cc core/java/android/app/Instrumentation.java
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Thu, 13 Apr 2017 12:13:00 +0000 (12:13 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 13 Apr 2017 12:13:03 +0000 (12:13 +0000)
		1	2
core/java/android/app/Activity.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/Fragment.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/Instrumentation.java	patch \|	diff1 \|	diff2 \|	blob \| history