diff options
| author | Steve Kondik <shade@chemlab.org> | 2010-07-30 14:11:36 -0400 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-07-30 14:11:36 -0400 |
| commit | 1eb5654219042fc6c073e877485bf7e35862fc76 (patch) | |
| tree | 867f7c3045b2b23fd176630a58826b985356f3e7 /camera | |
| parent | fe95321bf938f5edae40c8889f1492ce4b63f44e (diff) | |
| parent | 83407b993f79e06470100f605748aba41cbeb966 (diff) | |
| download | frameworks_base-1eb5654219042fc6c073e877485bf7e35862fc76.zip frameworks_base-1eb5654219042fc6c073e877485bf7e35862fc76.tar.gz frameworks_base-1eb5654219042fc6c073e877485bf7e35862fc76.tar.bz2 | |
Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into froyo
Diffstat (limited to 'camera')
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 1 | ||||
| -rw-r--r-- | camera/libcameraservice/CameraService.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 1ee5635..0ac089f 100644 --- a/camera/libcameraservice/CameraService.cpp +++ b/camera/libcameraservice/CameraService.cpp @@ -1,7 +1,6 @@ /* ** ** Copyright (C) 2008, The Android Open Source Project -** Copyright (C) 2008 HTC Inc. ** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. diff --git a/camera/libcameraservice/CameraService.h b/camera/libcameraservice/CameraService.h index 81c10b0..f04f39c 100644 --- a/camera/libcameraservice/CameraService.h +++ b/camera/libcameraservice/CameraService.h @@ -1,7 +1,6 @@ /* ** ** Copyright (C) 2008, The Android Open Source Project -** Copyright (C) 2008 HTC Inc. ** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. |