summaryrefslogtreecommitdiffstats
path: root/media/libmedia
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2011-03-17 12:31:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-03-17 12:31:09 -0700
commit782ffe91da665c6b1fb9e297faa6e0dc6035f40c (patch)
treee45c499d0326668415c8987cfee32387ed98c6db /media/libmedia
parent2c3257b21ddf2a3da843f11d1bb3b4fa8e912707 (diff)
parent9c0c5b5638fd2810b68e033963026cc1830b9ade (diff)
downloadframeworks_base-782ffe91da665c6b1fb9e297faa6e0dc6035f40c.zip
frameworks_base-782ffe91da665c6b1fb9e297faa6e0dc6035f40c.tar.gz
frameworks_base-782ffe91da665c6b1fb9e297faa6e0dc6035f40c.tar.bz2
am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files
* commit '9c0c5b5638fd2810b68e033963026cc1830b9ade': Fix missing AOSP copyright headers for a bunch of media framework files
Diffstat (limited to 'media/libmedia')
-rw-r--r--media/libmedia/IOMX.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/media/libmedia/IOMX.cpp b/media/libmedia/IOMX.cpp
index d6a1757..d3aab08 100644
--- a/media/libmedia/IOMX.cpp
+++ b/media/libmedia/IOMX.cpp
@@ -1,3 +1,19 @@
+/*
+ * Copyright (c) 2009 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
//#define LOG_NDEBUG 0
#define LOG_TAG "IOMX"
#include <utils/Log.h>