diff options
| author | Steve Block <steveblock@google.com> | 2009-11-13 11:12:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-13 11:12:40 -0800 |
| commit | a7a3609e1dd6b0bd6cfa37079ead1ef628fb66bc (patch) | |
| tree | 88d611d93f66a1afab95698500dd11acbbe45269 /WebKit/android/plugins/PluginViewBridgeAndroid.h | |
| parent | ec11f01af9a74053c7b20ee46e324757a73f7247 (diff) | |
| parent | 7063c3efe30d0ec965ac48439917030f62f50489 (diff) | |
| download | external_webkit-a7a3609e1dd6b0bd6cfa37079ead1ef628fb66bc.zip external_webkit-a7a3609e1dd6b0bd6cfa37079ead1ef628fb66bc.tar.gz external_webkit-a7a3609e1dd6b0bd6cfa37079ead1ef628fb66bc.tar.bz2 | |
am 7063c3ef: Merge change I67ad4b89 into eclair-mr2
Merge commit '7063c3efe30d0ec965ac48439917030f62f50489'
* commit '7063c3efe30d0ec965ac48439917030f62f50489':
Fixes license headers for all files in WebKit/android, other than those in stl/.
Diffstat (limited to 'WebKit/android/plugins/PluginViewBridgeAndroid.h')
| -rw-r--r-- | WebKit/android/plugins/PluginViewBridgeAndroid.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/WebKit/android/plugins/PluginViewBridgeAndroid.h b/WebKit/android/plugins/PluginViewBridgeAndroid.h index e17a2dc..5d16f46 100644 --- a/WebKit/android/plugins/PluginViewBridgeAndroid.h +++ b/WebKit/android/plugins/PluginViewBridgeAndroid.h @@ -6,23 +6,23 @@ * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: - * 1. Redistributions of source code must retain the above copyright + * * Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright + * * Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #ifndef PluginViewBridgeAndroid_H |