diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-01-18 08:56:56 -0500 |
|---|---|---|
| committer | Derek Sollenberger <derek@android.com> | 2012-02-06 14:14:40 -0500 |
| commit | 1cab2921ab279367f8206cdadc9259d12e603548 (patch) | |
| tree | 2852f9dc2481f639122e18fc7831ae6ca43d6d5a /src/animator/SkExtras.h | |
| parent | d7176fd5571bc9878d3cdac8696eaa35ec170d9d (diff) | |
| download | external_skia-1cab2921ab279367f8206cdadc9259d12e603548.zip external_skia-1cab2921ab279367f8206cdadc9259d12e603548.tar.gz external_skia-1cab2921ab279367f8206cdadc9259d12e603548.tar.bz2 | |
Skia merge (revision 3022)
This CL has companion changes to account for API updates in...
(1) frameworks/base
(2) external/webkit
Change-Id: Ibb989e76e8bd24313849f9631dbef42cdef9eb7d
Diffstat (limited to 'src/animator/SkExtras.h')
| -rw-r--r-- | src/animator/SkExtras.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/animator/SkExtras.h b/src/animator/SkExtras.h index 88e9b2d..dcd3905 100644 --- a/src/animator/SkExtras.h +++ b/src/animator/SkExtras.h @@ -1,19 +1,11 @@ -/* libs/graphics/animator/SkExtras.h -** -** Copyright 2006, 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. -*/ + +/* + * Copyright 2006 The Android Open Source Project + * + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + #ifndef SkExtras_DEFINED #define SkExtras_DEFINED |