Merge "Fix @code escapes"

author Neil Fuller <nfuller@google.com>

Fri, 15 Jan 2016 16:31:40 +0000 (16:31 +0000)

committer android-build-merger <android-build-merger@google.com>

Fri, 15 Jan 2016 16:31:40 +0000 (16:31 +0000)
author Neil Fuller <nfuller@google.com>
Fri, 15 Jan 2016 16:31:40 +0000 (16:31 +0000)
committer android-build-merger <android-build-merger@google.com>
Fri, 15 Jan 2016 16:31:40 +0000 (16:31 +0000)
diff --cc core/java/android/hardware/Camera.java
Simple merge
diff --cc core/res/AndroidManifest.xml
Simple merge
diff --cc docs/html/guide/topics/manifest/uses-feature-element.jd
Simple merge
author	Neil Fuller <nfuller@google.com>
	Fri, 15 Jan 2016 16:31:40 +0000 (16:31 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Fri, 15 Jan 2016 16:31:40 +0000 (16:31 +0000)
		1	2
core/java/android/hardware/Camera.java	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/AndroidManifest.xml	patch \|	diff1 \|	diff2 \|	blob \| history
docs/html/guide/topics/manifest/uses-feature-element.jd	patch \|	diff1 \|	diff2 \|	blob \| history