diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-29 17:52:09 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-29 17:52:09 -0700 |
commit | 0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf (patch) | |
tree | f352225433516c35c4435b82be44d91c0cca9379 /libs/camera | |
parent | 8a76a9085dbbca87b4c172577ca264d8b5f2ab32 (diff) | |
parent | 4506c62abd5767d6d42a97e8e87793a1b3bcb625 (diff) | |
download | frameworks_base-0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf.zip frameworks_base-0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf.tar.gz frameworks_base-0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf.tar.bz2 |
am 4506c62a: fix inaccurate copyrights
Merge commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp
* commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625':
fix inaccurate copyrights
Diffstat (limited to 'libs/camera')
-rw-r--r-- | libs/camera/Camera.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libs/camera/Camera.cpp b/libs/camera/Camera.cpp index 0037399..7efc6d7 100644 --- a/libs/camera/Camera.cpp +++ b/libs/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. |