Merge "cameraservice: update supportedFocusModes for api1" into lmp-dev

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

Tue, 19 Aug 2014 15:45:13 +0000 (15:45 +0000)

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

Tue, 19 Aug 2014 02:08:36 +0000 (02:08 +0000)
author Yin-Chia Yeh <yinchiayeh@google.com>
Tue, 19 Aug 2014 15:45:13 +0000 (15:45 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 19 Aug 2014 02:08:36 +0000 (02:08 +0000)
diff --cc services/camera/libcameraservice/api1/client2/Parameters.cpp
Simple merge
author	Yin-Chia Yeh <yinchiayeh@google.com>
	Tue, 19 Aug 2014 15:45:13 +0000 (15:45 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 19 Aug 2014 02:08:36 +0000 (02:08 +0000)