Merge "camera3: Update availableEffects, effectMode tags."

author Ruben Brunk <rubenbrunk@google.com>

Sat, 18 Jan 2014 00:44:20 +0000 (00:44 +0000)

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

Sat, 18 Jan 2014 00:44:20 +0000 (00:44 +0000)
author Ruben Brunk <rubenbrunk@google.com>
Sat, 18 Jan 2014 00:44:20 +0000 (00:44 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Sat, 18 Jan 2014 00:44:20 +0000 (00:44 +0000)
diff --cc camera/docs/docs.html
Simple merge
diff --cc camera/docs/metadata_properties.xml
Simple merge
author	Ruben Brunk <rubenbrunk@google.com>
	Sat, 18 Jan 2014 00:44:20 +0000 (00:44 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Sat, 18 Jan 2014 00:44:20 +0000 (00:44 +0000)
		1	2
camera/docs/docs.html	patch \|	diff1 \|	diff2 \|	blob \| history
camera/docs/metadata_properties.xml	patch \|	diff1 \|	diff2 \|	blob \| history