diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-30 12:08:31 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-07-30 12:08:31 -0700 |
| commit | 154a320069a316491c25b716f2aeea8c51a758e8 (patch) | |
| tree | a134148c3f13d24f3aca4ebc574899669d3efa63 /include | |
| parent | 4609b0a8fcfbed9b893301232dfa3b70bb30e4e2 (diff) | |
| parent | 27eecb704a27c1c73ed3449eba0307d8138b9c2e (diff) | |
| download | frameworks_base-154a320069a316491c25b716f2aeea8c51a758e8.zip frameworks_base-154a320069a316491c25b716f2aeea8c51a758e8.tar.gz frameworks_base-154a320069a316491c25b716f2aeea8c51a758e8.tar.bz2 | |
resolved conflicts for merge of 27eecb70 to gingerbread
Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/Camera.h | 1 | ||||
| -rw-r--r-- | include/media/IMediaRecorder.h | 2 | ||||
| -rw-r--r-- | include/media/PVMediaRecorder.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/include/camera/Camera.h b/include/camera/Camera.h index 9974f2f..964700b 100644 --- a/include/camera/Camera.h +++ b/include/camera/Camera.h @@ -1,6 +1,5 @@ /* * 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. diff --git a/include/media/IMediaRecorder.h b/include/media/IMediaRecorder.h index cfc17a5..54adca8 100644 --- a/include/media/IMediaRecorder.h +++ b/include/media/IMediaRecorder.h @@ -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"); ** you may not use this file except in compliance with the License. diff --git a/include/media/PVMediaRecorder.h b/include/media/PVMediaRecorder.h index f75d80d..c091c39 100644 --- a/include/media/PVMediaRecorder.h +++ b/include/media/PVMediaRecorder.h @@ -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"); ** you may not use this file except in compliance with the License. |