diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2010-07-09 11:06:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-09 11:06:12 -0700 |
| commit | 775e2b17108eeab5071b460dc6f40177226e891b (patch) | |
| tree | c7366e230a00333c9e72cf32310f03c66c95c12e | |
| parent | 6d43b9ceb777071c088fe12ee94af80e34816bcf (diff) | |
| parent | b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010 (diff) | |
| download | external_webkit-775e2b17108eeab5071b460dc6f40177226e891b.zip external_webkit-775e2b17108eeab5071b460dc6f40177226e891b.tar.gz external_webkit-775e2b17108eeab5071b460dc6f40177226e891b.tar.bz2 | |
am b34d9d68: merge from open-source master
Merge commit 'b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010'
* commit 'b34d9d688a0b9fc74c04ac9aba0ad7d6cbe10010':
Fix missing NL
| -rw-r--r-- | WebCore/page/Connection.cpp | 2 | ||||
| -rw-r--r-- | WebCore/platform/android/PackageNotifier.h | 2 | ||||
| -rw-r--r-- | WebKit/android/WebCoreSupport/CachedFramePlatformDataAndroid.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/WebCore/page/Connection.cpp b/WebCore/page/Connection.cpp index ffbb838..1031df3 100644 --- a/WebCore/page/Connection.cpp +++ b/WebCore/page/Connection.cpp @@ -36,4 +36,4 @@ Connection::ConnectionType Connection::type() const return networkStateNotifier().type(); } -};
\ No newline at end of file +}; diff --git a/WebCore/platform/android/PackageNotifier.h b/WebCore/platform/android/PackageNotifier.h index ad44bc7..d9b4fd4 100644 --- a/WebCore/platform/android/PackageNotifier.h +++ b/WebCore/platform/android/PackageNotifier.h @@ -66,4 +66,4 @@ PackageNotifier& packageNotifier(); #endif -#endif // PackageNotifier_h
\ No newline at end of file +#endif // PackageNotifier_h diff --git a/WebKit/android/WebCoreSupport/CachedFramePlatformDataAndroid.h b/WebKit/android/WebCoreSupport/CachedFramePlatformDataAndroid.h index ac22d05..20c7be4 100644 --- a/WebKit/android/WebCoreSupport/CachedFramePlatformDataAndroid.h +++ b/WebKit/android/WebCoreSupport/CachedFramePlatformDataAndroid.h @@ -60,4 +60,4 @@ private: } -#endif
\ No newline at end of file +#endif |