Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27eecb70 authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD

parents 3d8d9440 83407b99

camera/libcameraservice/CameraService.cpp

+0 −1
Original line number Diff line number Diff line 
/*

**

** 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

+0 −1
Original line number Diff line number Diff line 
/*

**

** 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.

include/camera/Camera.h

+0 −1
Original line number Diff line number Diff line 
/*

 * 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.

include/media/IMediaRecorder.h

+1 −1
Original line number Diff line number Diff line 
/*

 **

 ** Copyright 2008, HTC Inc.

 ** Copyright 2008, The Android Open Source Project

 **

 ** Licensed under the Apache License, Version 2.0 (the "License");

 ** you may not use this file except in compliance with the License.

include/media/PVMediaRecorder.h

+1 −1
Original line number Diff line number Diff line 
/*

 **

 ** Copyright 2008, HTC Inc.

 ** Copyright 2008, The Android Open Source Project

 **

 ** Licensed under the Apache License, Version 2.0 (the "License");

 ** you may not use this file except in compliance with the License.