Merge "Access mock location is no longer a runtime permission - settings" into mnc-dev

author Svet Ganov <svetoslavganov@google.com>

Wed, 13 May 2015 23:45:38 +0000 (23:45 +0000)

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

Wed, 13 May 2015 23:45:40 +0000 (23:45 +0000)
author Svet Ganov <svetoslavganov@google.com>
Wed, 13 May 2015 23:45:38 +0000 (23:45 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 13 May 2015 23:45:40 +0000 (23:45 +0000)
diff --cc res/values/strings.xml
Simple merge
diff --cc src/com/android/settings/DevelopmentSettings.java
Simple merge
author	Svet Ganov <svetoslavganov@google.com>
	Wed, 13 May 2015 23:45:38 +0000 (23:45 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 13 May 2015 23:45:40 +0000 (23:45 +0000)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
src/com/android/settings/DevelopmentSettings.java	patch \|	diff1 \|	diff2 \|	blob \| history