summaryrefslogtreecommitdiffstats
path: root/media/libmedia/IMediaRecorder.cpp
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-07-29 17:45:56 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2010-07-29 17:45:56 -0700
commitefe6039f71e9bac2138003b3287e94a7ab7e5c55 (patch)
tree7c7545aef44e4ee356f61b0379210f61b2a83691 /media/libmedia/IMediaRecorder.cpp
parent3cc219dfc67b866e10828f0c17641668d47c1cd8 (diff)
parent68335fdd6e9c1d622384612605d6952503cb7fd0 (diff)
downloadframeworks_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 'media/libmedia/IMediaRecorder.cpp')
-rw-r--r--media/libmedia/IMediaRecorder.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmedia/IMediaRecorder.cpp b/media/libmedia/IMediaRecorder.cpp
index 2bc2a7e..1de9f9b 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.