Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of 27eecb70 to gingerbread

Browse Source 
Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
This commit is contained in:
Jean-Baptiste Queru
2010-07-30 12:08:31 -07:00
parent 4609b0a8fc 27eecb704a
commit 154a320069
9 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/camera/Camera.h
View File

@@ -1,6 +1,5 @@
/* /*
* Copyright (C) 2008 The Android Open Source Project * Copyright (C) 2008 The Android Open Source Project
* Copyright (C) 2008 HTC Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.

2
include/media/IMediaRecorder.h
View File

@@ -1,6 +1,6 @@
/* /*
** **
** Copyright 2008, HTC Inc. ** Copyright 2008, The Android Open Source Project
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License. ** you may not use this file except in compliance with the License.

2
include/media/PVMediaRecorder.h
View File

@@ -1,6 +1,6 @@
/* /*
** **
** Copyright 2008, HTC Inc. ** Copyright 2008, The Android Open Source Project
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License. ** you may not use this file except in compliance with the License.

1
libs/camera/Camera.cpp
View File

@@ -1,7 +1,6 @@
/* /*
** **
** Copyright (C) 2008, The Android Open Source Project ** Copyright (C) 2008, The Android Open Source Project
** Copyright (C) 2008 HTC Inc.
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License. ** you may not use this file except in compliance with the License.

2
media/libmedia/IMediaRecorder.cpp
View File

@@ -1,6 +1,6 @@
/* /*
** **
** Copyright 2008, HTC Inc. ** Copyright 2008, The Android Open Source Project
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License. ** you may not use this file except in compliance with the License.

2
media/libmediaplayerservice/MediaRecorderClient.cpp
View File

@@ -1,5 +1,5 @@
/* /*
** Copyright 2008, HTC Inc. ** Copyright 2008, The Android Open Source Project
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License. ** you may not use this file except in compliance with the License.

2
media/libmediaplayerservice/MediaRecorderClient.h
View File

@@ -1,6 +1,6 @@
/* /*
** **
** Copyright 2008, HTC Inc. ** Copyright 2008, The Android Open Source Project
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License. ** you may not use this file except in compliance with the License.

1
services/camera/libcameraservice/CameraService.cpp
View File

@@ -1,7 +1,6 @@
/* /*
** **
** Copyright (C) 2008, The Android Open Source Project ** Copyright (C) 2008, The Android Open Source Project
** Copyright (C) 2008 HTC Inc.
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License. ** you may not use this file except in compliance with the License.

1
services/camera/libcameraservice/CameraService.h
View File

@@ -1,7 +1,6 @@
/* /*
** **
** Copyright (C) 2008, The Android Open Source Project ** Copyright (C) 2008, The Android Open Source Project
** Copyright (C) 2008 HTC Inc.
** **
** Licensed under the Apache License, Version 2.0 (the "License"); ** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License. ** you may not use this file except in compliance with the License.