diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-07-29 17:54:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-29 17:54:42 -0700 |
| commit | 8f5d160c92bb03a9156301e0577fa590f1ce0199 (patch) | |
| tree | cf7416cc5463c04ef7062dc78f55e458d3b93ae9 /media | |
| parent | edb2fc6aa8eaa3a8423db877a9ee92123994fc75 (diff) | |
| parent | 0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf (diff) | |
| download | frameworks_base-8f5d160c92bb03a9156301e0577fa590f1ce0199.zip frameworks_base-8f5d160c92bb03a9156301e0577fa590f1ce0199.tar.gz frameworks_base-8f5d160c92bb03a9156301e0577fa590f1ce0199.tar.bz2 | |
am 0c51c98f: am 4506c62a: fix inaccurate copyrights
Merge commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf'
* commit '0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf':
fix inaccurate copyrights
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/IMediaRecorder.cpp | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaRecorderClient.cpp | 2 | ||||
| -rw-r--r-- | media/libmediaplayerservice/MediaRecorderClient.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/IMediaRecorder.cpp b/media/libmedia/IMediaRecorder.cpp index 9fe207c..4eb63e8 100644 --- a/media/libmedia/IMediaRecorder.cpp +++ b/media/libmedia/IMediaRecorder.cpp @@ -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/media/libmediaplayerservice/MediaRecorderClient.cpp b/media/libmediaplayerservice/MediaRecorderClient.cpp index fef3e6e..73862c3 100644 --- a/media/libmediaplayerservice/MediaRecorderClient.cpp +++ b/media/libmediaplayerservice/MediaRecorderClient.cpp @@ -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"); ** you may not use this file except in compliance with the License. diff --git a/media/libmediaplayerservice/MediaRecorderClient.h b/media/libmediaplayerservice/MediaRecorderClient.h index d12e558..1d1913d 100644 --- a/media/libmediaplayerservice/MediaRecorderClient.h +++ b/media/libmediaplayerservice/MediaRecorderClient.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. |