Merge "Add a privileged permission to get user accounts" into mnc-dev

author Svetoslav Ganov <svetoslavganov@google.com>

Wed, 22 Jul 2015 21:41:40 +0000 (21:41 +0000)

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

Wed, 22 Jul 2015 21:41:40 +0000 (21:41 +0000)
author Svetoslav Ganov <svetoslavganov@google.com>
Wed, 22 Jul 2015 21:41:40 +0000 (21:41 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 22 Jul 2015 21:41:40 +0000 (21:41 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
author	Svetoslav Ganov <svetoslavganov@google.com>
	Wed, 22 Jul 2015 21:41:40 +0000 (21:41 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 22 Jul 2015 21:41:40 +0000 (21:41 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history