diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-07-29 17:45:56 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2010-07-29 17:45:56 -0700 |
| commit | 27eecb704a27c1c73ed3449eba0307d8138b9c2e (patch) | |
| tree | 65bfdcc360ba98d1c639f2d77cb099c1fefeab0c /camera/libcameraservice/CameraService.cpp | |
| parent | 3d8d9440d844816f065d2b10eb75bb693683cdad (diff) | |
| parent | 83407b993f79e06470100f605748aba41cbeb966 (diff) | |
| download | frameworks_base-27eecb704a27c1c73ed3449eba0307d8138b9c2e.zip frameworks_base-27eecb704a27c1c73ed3449eba0307d8138b9c2e.tar.gz frameworks_base-27eecb704a27c1c73ed3449eba0307d8138b9c2e.tar.bz2 | |
Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD
Diffstat (limited to 'camera/libcameraservice/CameraService.cpp')
| -rw-r--r-- | camera/libcameraservice/CameraService.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/camera/libcameraservice/CameraService.cpp b/camera/libcameraservice/CameraService.cpp index 2690182..118249e 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. |