Merge "Temporarily whitelist an app for network during doze" into mnc-dev

author Amith Yamasani <yamasani@google.com>

Tue, 2 Jun 2015 20:34:58 +0000 (20:34 +0000)

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

Tue, 2 Jun 2015 20:34:59 +0000 (20:34 +0000)
author Amith Yamasani <yamasani@google.com>
Tue, 2 Jun 2015 20:34:58 +0000 (20:34 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 2 Jun 2015 20:34:59 +0000 (20:34 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
author	Amith Yamasani <yamasani@google.com>
	Tue, 2 Jun 2015 20:34:58 +0000 (20:34 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 2 Jun 2015 20:34:59 +0000 (20:34 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history