Merge changes from topics 'cam-ndk-hidden-enum', 'cam-ndk-enum-dco', 'cam-ndk-hidden...

author Yin-Chia Yeh <yinchiayeh@google.com>

Thu, 7 Apr 2016 22:33:36 +0000 (22:33 +0000)

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

Thu, 7 Apr 2016 22:33:37 +0000 (22:33 +0000)
author Yin-Chia Yeh <yinchiayeh@google.com>
Thu, 7 Apr 2016 22:33:36 +0000 (22:33 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 7 Apr 2016 22:33:37 +0000 (22:33 +0000)
diff --cc camera/docs/docs.html
Simple merge
diff --cc camera/docs/metadata_properties.xml
Simple merge
author	Yin-Chia Yeh <yinchiayeh@google.com>
	Thu, 7 Apr 2016 22:33:36 +0000 (22:33 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 7 Apr 2016 22:33:37 +0000 (22:33 +0000)
		1	2
camera/docs/docs.html	patch \|	diff1 \|	diff2 \|	blob \| history
camera/docs/metadata_properties.xml	patch \|	diff1 \|	diff2 \|	blob \| history