diff options
| author | James Dong <jdong@google.com> | 2011-03-07 14:45:51 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-07 14:45:51 -0800 |
| commit | 38978f57fec45748fd1eb7f96d25bc4e8415aabb (patch) | |
| tree | 55f387e07f6833fb6feb72cb584c4121ededdf56 | |
| parent | e6482914b71449319abd691f304b6ae9223f97a1 (diff) | |
| parent | fbb1909036ba7de3d9fb8738daba60b357881153 (diff) | |
| download | frameworks_av-38978f57fec45748fd1eb7f96d25bc4e8415aabb.zip frameworks_av-38978f57fec45748fd1eb7f96d25bc4e8415aabb.tar.gz frameworks_av-38978f57fec45748fd1eb7f96d25bc4e8415aabb.tar.bz2 | |
am a7c9dffd: am 4ed072f9: Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1
* commit 'a7c9dffdb8097105482ce976ba0a51baa76d8806':
Add missing copyright headers to a couple of files
| -rw-r--r-- | media/libstagefright/NuHTTPDataSource.cpp | 16 | ||||
| -rw-r--r-- | media/libstagefright/include/NuHTTPDataSource.h | 16 |
2 files changed, 32 insertions, 0 deletions
diff --git a/media/libstagefright/NuHTTPDataSource.cpp b/media/libstagefright/NuHTTPDataSource.cpp index dbbf3b4..b24343f 100644 --- a/media/libstagefright/NuHTTPDataSource.cpp +++ b/media/libstagefright/NuHTTPDataSource.cpp @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2010 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 "NuHTTPDataSource" #include <utils/Log.h> diff --git a/media/libstagefright/include/NuHTTPDataSource.h b/media/libstagefright/include/NuHTTPDataSource.h index 082b589..2569568 100644 --- a/media/libstagefright/include/NuHTTPDataSource.h +++ b/media/libstagefright/include/NuHTTPDataSource.h @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2010 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. + */ + #ifndef NU_HTTP_DATA_SOURCE_H_ #define NU_HTTP_DATA_SOURCE_H_ |