am 9be4d65d: am af3d2887: Camera2: Change policy for calculating previewFpsRange...

author Igor Murashkin <iam@google.com>

Fri, 5 Oct 2012 19:17:02 +0000 (12:17 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Fri, 5 Oct 2012 19:17:02 +0000 (12:17 -0700)
author Igor Murashkin <iam@google.com>
Fri, 5 Oct 2012 19:17:02 +0000 (12:17 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Fri, 5 Oct 2012 19:17:02 +0000 (12:17 -0700)
diff --cc services/camera/libcameraservice/camera2/Parameters.cpp
Simple merge
diff --cc services/camera/libcameraservice/camera2/Parameters.h
Simple merge
author	Igor Murashkin <iam@google.com>
	Fri, 5 Oct 2012 19:17:02 +0000 (12:17 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Fri, 5 Oct 2012 19:17:02 +0000 (12:17 -0700)
		1	2
services/camera/libcameraservice/camera2/Parameters.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
services/camera/libcameraservice/camera2/Parameters.h	patch \|	diff1 \|	diff2 \|	blob \| history