Merge "Changes in DeviceIdlecontroller and JobScheduler to support Auto GarageMode."

author Yao Chen <yaochen@google.com>

Fri, 15 Jan 2016 20:09:11 +0000 (20:09 +0000)

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

Fri, 15 Jan 2016 20:09:11 +0000 (20:09 +0000)
author Yao Chen <yaochen@google.com>
Fri, 15 Jan 2016 20:09:11 +0000 (20:09 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 15 Jan 2016 20:09:11 +0000 (20:09 +0000)
diff --cc Android.mk
Simple merge
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc services/core/java/com/android/server/DeviceIdleController.java
Simple merge
author	Yao Chen <yaochen@google.com>
	Fri, 15 Jan 2016 20:09:11 +0000 (20:09 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 15 Jan 2016 20:09:11 +0000 (20:09 +0000)
		1	2
Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/DeviceIdleController.java	patch \|	diff1 \|	diff2 \|	blob \| history