Merge "Unify permissions under UPDATE_DEVICE_STATS."

author Jeff Sharkey <jsharkey@google.com>

Tue, 18 Jul 2017 16:17:02 +0000 (16:17 +0000)

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

Tue, 18 Jul 2017 16:17:02 +0000 (16:17 +0000)
author Jeff Sharkey <jsharkey@google.com>
Tue, 18 Jul 2017 16:17:02 +0000 (16:17 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 18 Jul 2017 16:17:02 +0000 (16:17 +0000)
diff --cc api/system-current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
author	Jeff Sharkey <jsharkey@google.com>
	Tue, 18 Jul 2017 16:17:02 +0000 (16:17 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 18 Jul 2017 16:17:02 +0000 (16:17 +0000)
		1	2
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history