summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-07-29 17:52:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-29 17:52:09 -0700
commit0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf (patch)
treef352225433516c35c4435b82be44d91c0cca9379 /media/libmedia
parent8a76a9085dbbca87b4c172577ca264d8b5f2ab32 (diff)
parent4506c62abd5767d6d42a97e8e87793a1b3bcb625 (diff)
downloadframeworks_base-0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf.zip
frameworks_base-0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf.tar.gz
frameworks_base-0c51c98fd9edf0bdc8f2c567470fc332b5ae3adf.tar.bz2
am 4506c62a: fix inaccurate copyrights
Merge commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625' into gingerbread-plus-aosp * commit '4506c62abd5767d6d42a97e8e87793a1b3bcb625': fix inaccurate copyrights
Diffstat (limited to 'media/libmedia')
-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 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.