Merge "Implement device idle in power manager." into mnc-dev

author Dianne Hackborn <hackbod@google.com>

Mon, 11 May 2015 22:22:35 +0000 (22:22 +0000)

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

Mon, 11 May 2015 22:22:36 +0000 (22:22 +0000)
author Dianne Hackborn <hackbod@google.com>
Mon, 11 May 2015 22:22:35 +0000 (22:22 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Mon, 11 May 2015 22:22:36 +0000 (22:22 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
author	Dianne Hackborn <hackbod@google.com>
	Mon, 11 May 2015 22:22:35 +0000 (22:22 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Mon, 11 May 2015 22:22:36 +0000 (22:22 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history