Merge "camera: Add external flash mode key"

author TreeHugger Robot <treehugger-gerrit@google.com>

Fri, 19 Jan 2018 04:19:23 +0000 (04:19 +0000)

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

Fri, 19 Jan 2018 04:19:23 +0000 (04:19 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Fri, 19 Jan 2018 04:19:23 +0000 (04:19 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 19 Jan 2018 04:19:23 +0000 (04:19 +0000)
diff --cc camera/docs/docs.html
Simple merge
diff --cc camera/docs/metadata_definitions.xml
Simple merge
diff --cc camera/include/system/camera_metadata_tags.h
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Fri, 19 Jan 2018 04:19:23 +0000 (04:19 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 19 Jan 2018 04:19:23 +0000 (04:19 +0000)
		1	2
camera/docs/docs.html	patch \|	diff1 \|	diff2 \|	blob \| history
camera/docs/metadata_definitions.xml	patch \|	diff1 \|	diff2 \|	blob \| history
camera/include/system/camera_metadata_tags.h	patch \|	diff1 \|	diff2 \|	blob \| history