commit 3d4ba7f5734db06e5aa877b65d2ef0e7ae3c9550
author Andreas Huber <andih@google.com> Fri Jul 30 08:05:56 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jul 30 08:05:56 2010 -0700
tree bbcf68e1a77a6e8e44df6b8596d7b7e1d528373e
parent 7b8a2361cef04d38e45a08ad3927a66b644d3c97
parent 9c990d4d8aa736d86427b48fb00cbe9ed9b0b4d4

Merge "Add a missing break; to restore old functionality and not turn off the screen after 30secs regardless of system preference." into froyo

camera/libcameraservice/CameraService.cpp

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.

camera/libcameraservice/CameraService.h

diff --git a/camera/libcameraservice/CameraService.h b/camera/libcameraservice/CameraService.h
index bc49b1d..75e96c6 100644
--- a/camera/libcameraservice/CameraService.h
+++ b/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.