am fd53d835: Add stringType and requiredPermissions to SensorManager.java, as well...

author Etienne Le Grand <etn@google.com>

Sat, 5 Apr 2014 01:52:27 +0000 (01:52 +0000)

committer Android Git Automerger <android-git-automerger@android.com>

Sat, 5 Apr 2014 01:52:27 +0000 (01:52 +0000)
author Etienne Le Grand <etn@google.com>
Sat, 5 Apr 2014 01:52:27 +0000 (01:52 +0000)
committer Android Git Automerger <android-git-automerger@android.com>
Sat, 5 Apr 2014 01:52:27 +0000 (01:52 +0000)
diff --cc api/current.txt
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc core/res/res/values/strings.xml
Simple merge
author	Etienne Le Grand <etn@google.com>
	Sat, 5 Apr 2014 01:52:27 +0000 (01:52 +0000)
committer	Android Git Automerger <android-git-automerger@android.com>
	Sat, 5 Apr 2014 01:52:27 +0000 (01:52 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history