Revert of Fix TODOs related to SDK 24

android_webview/apk/java/proguard.flags

Index: android_webview/apk/java/proguard.flags
diff --git a/android_webview/apk/java/proguard.flags b/android_webview/apk/java/proguard.flags
index c4cf0a424c36fe1ffc28419eca6d0faa877490d1..495d48612b206412744f05995b6b73d480fe0c82 100644
--- a/android_webview/apk/java/proguard.flags
+++ b/android_webview/apk/java/proguard.flags
@@ -70,5 +70,11 @@
 }
 -dontnote com.android.webview.chromium.AwSafeBrowsingApiHandler
 
+#TODO(hush): remove after N release. crbug.com/546762
+-keep class com.android.webview.chromium.ContentSettingsAdapter {
+  public void setDisabledActionModeMenuItems(int);
+  public int getDisabledActionModeMenuItems();
+}
+
 # We strip some unused resources when preprocessing the GMS client libs.
 -dontwarn com.google.android.gms.R**