summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2014-01-23 14:31:38 -0800
committerSelim Gurun <sgurun@google.com>2014-01-23 22:35:34 +0000
commit9281a85e9587dec5e4b2eb55b6b8b55b6368d6f7 (patch)
tree55eb812a5b34bb544b2b0d7c7e1d1992dda3cb59
parentf0f06187a11edc8887aac508c27f28c840764f6f (diff)
downloadandroid_frameworks_webview-9281a85e9587dec5e4b2eb55b6b8b55b6368d6f7.tar.gz
android_frameworks_webview-9281a85e9587dec5e4b2eb55b6b8b55b6368d6f7.tar.bz2
android_frameworks_webview-9281a85e9587dec5e4b2eb55b6b8b55b6368d6f7.zip
Remove @override to fix build break
Remove @override to fix a build break in master-gpl branch. Change-Id: Id3f58dbecfec4a806f7857a6c1c73954e1bdd6e3 (cherry picked from commit 106c4320b02fb790d9955de133013662bbdc3094)
-rw-r--r--chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
index b823543..dccc855 100644
--- a/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
+++ b/chromium/java/com/android/webview/chromium/WebViewChromiumFactoryProvider.java
@@ -274,7 +274,6 @@ public class WebViewChromiumFactoryProvider implements WebViewFactoryProvider {
}
}
- @Override
public void freeMemoryForTests() {
if (ActivityManager.isRunningInTestHarness()) {
MemoryPressureListener.maybeNotifyMemoryPresure(