Merge "Camera2/3: Fix still image FOV reporting." into jb-mr2-dev

author Eino-Ville Talvala <etalvala@google.com>

Thu, 2 May 2013 21:17:44 +0000 (21:17 +0000)

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

Thu, 2 May 2013 21:17:44 +0000 (21:17 +0000)
author Eino-Ville Talvala <etalvala@google.com>
Thu, 2 May 2013 21:17:44 +0000 (21:17 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Thu, 2 May 2013 21:17:44 +0000 (21:17 +0000)
diff --cc services/camera/libcameraservice/camera2/Parameters.cpp
Simple merge
diff --cc services/camera/libcameraservice/camera2/Parameters.h
Simple merge
author	Eino-Ville Talvala <etalvala@google.com>
	Thu, 2 May 2013 21:17:44 +0000 (21:17 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Thu, 2 May 2013 21:17:44 +0000 (21:17 +0000)
		1	2
services/camera/libcameraservice/camera2/Parameters.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/camera/libcameraservice/camera2/Parameters.h	patch \|	diff1 \|	diff2 \|	blob \| history