summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-07-29 17:52:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-29 17:52:09 -0700
commit0319aaecb03aa83924ab4e3d9c9bc657c2e8bc06 (patch)
tree7c3ae3eecc16c50c794aff141a89b14942117364 /camera
parent0895d83cb62d269468e64a00e9e89fa7697f2f84 (diff)
parent01cff464978aa0f749f42650180b45ea56cb17de (diff)
downloadframeworks_av-0319aaecb03aa83924ab4e3d9c9bc657c2e8bc06.zip
frameworks_av-0319aaecb03aa83924ab4e3d9c9bc657c2e8bc06.tar.gz
frameworks_av-0319aaecb03aa83924ab4e3d9c9bc657c2e8bc06.tar.bz2
am 4506c62a: fix inaccurate copyrights
Merge commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp * commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625': fix inaccurate copyrights
Diffstat (limited to 'camera')
-rw-r--r--camera/Camera.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/camera/Camera.cpp b/camera/Camera.cpp
index 0037399..7efc6d7 100644
--- a/camera/Camera.cpp
+++ b/camera/Camera.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.