diff options
author | James Dong <jdong@google.com> | 2011-03-17 12:38:58 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-17 12:38:58 -0700 |
commit | be3c82f25d45ccd1600ec23bab80c2e8a35a0474 (patch) | |
tree | 239a5bf48c535f9580278a1b3126492100a2162c /include/media | |
parent | 454b2d1c34238ba33d8f6861971a74c80c3e302a (diff) | |
parent | 782ffe91da665c6b1fb9e297faa6e0dc6035f40c (diff) | |
download | frameworks_base-be3c82f25d45ccd1600ec23bab80c2e8a35a0474.zip frameworks_base-be3c82f25d45ccd1600ec23bab80c2e8a35a0474.tar.gz frameworks_base-be3c82f25d45ccd1600ec23bab80c2e8a35a0474.tar.bz2 |
am 782ffe91: am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files
* commit '782ffe91da665c6b1fb9e297faa6e0dc6035f40c':
Fix missing AOSP copyright headers for a bunch of media framework files
Diffstat (limited to 'include/media')
-rw-r--r-- | include/media/stagefright/ACodec.h | 16 | ||||
-rw-r--r-- | include/media/stagefright/MediaDebug.h | 16 | ||||
-rw-r--r-- | include/media/stagefright/foundation/AHandlerReflector.h | 16 | ||||
-rw-r--r-- | include/media/stagefright/foundation/AHierarchicalStateMachine.h | 16 |
4 files changed, 64 insertions, 0 deletions
diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index a969796..f13e9bb 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.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 A_CODEC_H_ #define A_CODEC_H_ diff --git a/include/media/stagefright/MediaDebug.h b/include/media/stagefright/MediaDebug.h index c8a8f00..2ca9667 100644 --- a/include/media/stagefright/MediaDebug.h +++ b/include/media/stagefright/MediaDebug.h @@ -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. + */ + #ifndef MEDIA_DEBUG_H_ #define MEDIA_DEBUG_H_ diff --git a/include/media/stagefright/foundation/AHandlerReflector.h b/include/media/stagefright/foundation/AHandlerReflector.h index 857866a..9d201b5 100644 --- a/include/media/stagefright/foundation/AHandlerReflector.h +++ b/include/media/stagefright/foundation/AHandlerReflector.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 A_HANDLER_REFLECTOR_H_ #define A_HANDLER_REFLECTOR_H_ diff --git a/include/media/stagefright/foundation/AHierarchicalStateMachine.h b/include/media/stagefright/foundation/AHierarchicalStateMachine.h index b5786fb..d2e6b28 100644 --- a/include/media/stagefright/foundation/AHierarchicalStateMachine.h +++ b/include/media/stagefright/foundation/AHierarchicalStateMachine.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 A_HIERARCHICAL_STATE_MACHINE_H_ #define A_HIERARCHICAL_STATE_MACHINE_H_ |