diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-25 09:54:23 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-25 09:54:23 -0700 |
| commit | 468f23ac2fa3db150b6c626417de44f5c0f17fa0 (patch) | |
| tree | 011243ada20daf9b05dd68bfd02f664141875100 /libpixelflinger | |
| parent | bdcf98ddbf2022ef894dfd7f9278e6f345e2c2df (diff) | |
| parent | bdc36d641c2d557cc20b8cf044048f0a8c72e774 (diff) | |
| download | system_core-468f23ac2fa3db150b6c626417de44f5c0f17fa0.zip system_core-468f23ac2fa3db150b6c626417de44f5c0f17fa0.tar.gz system_core-468f23ac2fa3db150b6c626417de44f5c0f17fa0.tar.bz2 | |
Manual merge
Change-Id: I849703a709fe4bf9ea7181268221d9b648b2e73d
Diffstat (limited to 'libpixelflinger')
| -rw-r--r-- | libpixelflinger/col32cb16blend.S | 31 | ||||
| -rw-r--r-- | libpixelflinger/col32cb16blend_neon.S | 32 |
2 files changed, 31 insertions, 32 deletions
diff --git a/libpixelflinger/col32cb16blend.S b/libpixelflinger/col32cb16blend.S index 1450bde..1831255 100644 --- a/libpixelflinger/col32cb16blend.S +++ b/libpixelflinger/col32cb16blend.S @@ -1,20 +1,19 @@ /* libs/pixelflinger/col32cb16blend.S -** -** (C) COPYRIGHT 2009 ARM Limited. -** -** 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. -** -*/ + * + * 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. + */ .text .align diff --git a/libpixelflinger/col32cb16blend_neon.S b/libpixelflinger/col32cb16blend_neon.S index 17b0d01..cbd54d1 100644 --- a/libpixelflinger/col32cb16blend_neon.S +++ b/libpixelflinger/col32cb16blend_neon.S @@ -1,20 +1,20 @@ /* libs/pixelflinger/col32cb16blend_neon.S -** -** (C) COPYRIGHT 2009 ARM Limited. -** -** 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. -** -*/ + * + * 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. + */ + .text .align |