diff options
| author | Derek Sollenberger <djsollen@google.com> | 2012-02-06 17:04:56 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2012-02-06 17:04:56 -0500 |
| commit | f38586182f365608ae37e8d31bc046932954fe61 (patch) | |
| tree | 2852f9dc2481f639122e18fc7831ae6ca43d6d5a /include/views/SkBorderView.h | |
| parent | e8e9117d037dc190000b57da0d47bbb47b1ca1eb (diff) | |
| parent | 0a6004fdb6c99bccb8bc0bb9686616870dae73f3 (diff) | |
| download | external_skia-f38586182f365608ae37e8d31bc046932954fe61.zip external_skia-f38586182f365608ae37e8d31bc046932954fe61.tar.gz external_skia-f38586182f365608ae37e8d31bc046932954fe61.tar.bz2 | |
resolved conflicts for merge of 0a6004fd to master
Change-Id: I3b4536dedc12ad3de40aa2f6c357423bf33bce72
Diffstat (limited to 'include/views/SkBorderView.h')
| -rw-r--r-- | include/views/SkBorderView.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/include/views/SkBorderView.h b/include/views/SkBorderView.h index 94ccc1f..02f8725 100644 --- a/include/views/SkBorderView.h +++ b/include/views/SkBorderView.h @@ -1,19 +1,12 @@ + /* - * Copyright (C) 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 + * Copyright 2006 The Android Open Source Project * - * 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. + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. */ + #ifndef SkBorderView_DEFINED #define SkBorderView_DEFINED |