Merge "Revert "PowerManager: Adds the Sustained performance API."" into nyc-dev

author Ruchi Kandoi <kandoiruchi@google.com>

Wed, 20 Apr 2016 20:59:18 +0000 (20:59 +0000)

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

Wed, 20 Apr 2016 20:59:20 +0000 (20:59 +0000)
author Ruchi Kandoi <kandoiruchi@google.com>
Wed, 20 Apr 2016 20:59:18 +0000 (20:59 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 20 Apr 2016 20:59:20 +0000 (20:59 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
author	Ruchi Kandoi <kandoiruchi@google.com>
	Wed, 20 Apr 2016 20:59:18 +0000 (20:59 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 20 Apr 2016 20:59:20 +0000 (20:59 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history