diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-07-29 17:45:56 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2010-07-29 17:45:56 -0700 |
commit | efe6039f71e9bac2138003b3287e94a7ab7e5c55 (patch) | |
tree | 7c7545aef44e4ee356f61b0379210f61b2a83691 /include/media | |
parent | 3cc219dfc67b866e10828f0c17641668d47c1cd8 (diff) | |
parent | 68335fdd6e9c1d622384612605d6952503cb7fd0 (diff) | |
download | frameworks_av-efe6039f71e9bac2138003b3287e94a7ab7e5c55.zip frameworks_av-efe6039f71e9bac2138003b3287e94a7ab7e5c55.tar.gz frameworks_av-efe6039f71e9bac2138003b3287e94a7ab7e5c55.tar.bz2 |
Merge branch 'froyo' of git://android.git.kernel.org/platform/frameworks/base into HEAD
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/IMediaRecorder.h | 2 | ||||
-rw-r--r-- | include/media/PVMediaRecorder.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/media/IMediaRecorder.h b/include/media/IMediaRecorder.h index 24ac82b..73bf2ee 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 4f17c1a..2a1298a 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. |