Merge "Move the 'pretend idle jobs can run now' broadcast into AMS" into nyc-dev

author Chris Tate <ctate@android.com>

Fri, 6 May 2016 21:34:50 +0000 (21:34 +0000)

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

Fri, 6 May 2016 21:34:52 +0000 (21:34 +0000)
author Chris Tate <ctate@android.com>
Fri, 6 May 2016 21:34:50 +0000 (21:34 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 6 May 2016 21:34:52 +0000 (21:34 +0000)
diff --cc core/java/android/app/ActivityManagerNative.java
Simple merge
diff --cc core/java/android/app/IActivityManager.java
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Chris Tate <ctate@android.com>
	Fri, 6 May 2016 21:34:50 +0000 (21:34 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 6 May 2016 21:34:52 +0000 (21:34 +0000)
		1	2
core/java/android/app/ActivityManagerNative.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/java/android/app/IActivityManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history