diff options
| author | James Dong <jdong@google.com> | 2011-03-07 14:41:50 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-07 14:41:50 -0800 |
| commit | 4ed072f904b5344ce4ef6f832c618a1d3f43867d (patch) | |
| tree | 6a06f58ecbbc7a873c39b14ed8cef23a6e87c4f1 /media | |
| parent | 6478e4f0b0a6d34251ca0125eb6067f038e344aa (diff) | |
| parent | e2693e5d6237a2aacda3c337eabfc42af273c594 (diff) | |
| download | frameworks_base-4ed072f904b5344ce4ef6f832c618a1d3f43867d.zip frameworks_base-4ed072f904b5344ce4ef6f832c618a1d3f43867d.tar.gz frameworks_base-4ed072f904b5344ce4ef6f832c618a1d3f43867d.tar.bz2 | |
Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1
Diffstat (limited to 'media')
| -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_ |