diff options
| author | Igor Murashkin <iam@google.com> | 2014-03-25 20:15:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-25 20:15:40 +0000 |
| commit | c3dcf1007aa964f825b2ea2ef86acb7f332e748f (patch) | |
| tree | c3e72b5ad4c3a145413a2a6e964719dbf908059e /camera/Android.mk | |
| parent | a1aaaf86cd04eabaf961a30d7b0a9fa857089862 (diff) | |
| parent | 65550a0e17852fe657795508e3bf05bdbfb2520b (diff) | |
| download | frameworks_av-c3dcf1007aa964f825b2ea2ef86acb7f332e748f.zip frameworks_av-c3dcf1007aa964f825b2ea2ef86acb7f332e748f.tar.gz frameworks_av-c3dcf1007aa964f825b2ea2ef86acb7f332e748f.tar.bz2 | |
am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
* commit '65550a0e17852fe657795508e3bf05bdbfb2520b':
DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
Diffstat (limited to 'camera/Android.mk')
| -rw-r--r-- | camera/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index e633450..5cedab0 100644 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -8,6 +8,7 @@ LOCAL_SRC_FILES:= \ Camera.cpp \ CameraMetadata.cpp \ CameraParameters.cpp \ + CameraParameters2.cpp \ ICamera.cpp \ ICameraClient.cpp \ ICameraService.cpp \ |