summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-07-30 12:08:31 -0700
committerJean-Baptiste Queru <jbq@google.com>2010-07-30 12:08:31 -0700
commit9da2070b6d6d20550de7da61478c325f0928d020 (patch)
treef1548891fab33ca03923f70cf25a2ffeab50be82 /camera
parent3be9523784cc4038f601e510faee595117cdacb3 (diff)
parentefe6039f71e9bac2138003b3287e94a7ab7e5c55 (diff)
downloadframeworks_av-9da2070b6d6d20550de7da61478c325f0928d020.zip
frameworks_av-9da2070b6d6d20550de7da61478c325f0928d020.tar.gz
frameworks_av-9da2070b6d6d20550de7da61478c325f0928d020.tar.bz2
resolved conflicts for merge of 27eecb70 to gingerbread
Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
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.