summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-07-29 17:54:42 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-29 17:54:42 -0700
commitbc286dce1af6670824fba4167e0750b631168d72 (patch)
treef6d30ddc5cee2a6562bb510d7bacf20806b9f9bb /services
parentc4e47d1e81c4e4403663cb911e98dbf3ada9942c (diff)
parent0319aaecb03aa83924ab4e3d9c9bc657c2e8bc06 (diff)
downloadframeworks_av-bc286dce1af6670824fba4167e0750b631168d72.zip
frameworks_av-bc286dce1af6670824fba4167e0750b631168d72.tar.gz
frameworks_av-bc286dce1af6670824fba4167e0750b631168d72.tar.bz2
am 0c51c98f: am 4506c62a: fix inaccurate copyrights
Merge commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf' * commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf': fix inaccurate copyrights
Diffstat (limited to 'services')
-rw-r--r--services/camera/libcameraservice/CameraService.cpp1
-rw-r--r--services/camera/libcameraservice/CameraService.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp
index c786f94..3b3904a 100644
--- a/services/camera/libcameraservice/CameraService.cpp
+++ b/services/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/services/camera/libcameraservice/CameraService.h b/services/camera/libcameraservice/CameraService.h
index b0b2d7a..77ccf41 100644
--- a/services/camera/libcameraservice/CameraService.h
+++ b/services/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.