summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-03-17 20:47:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-03-17 20:47:33 +0000
commitd75a3b4d2cf0bf743cfc5fc6d908ea7e8a8fafd0 (patch)
tree8f6d4a027f2dbe6c18005c7a9e8fab76d2434a1b
parentee0f4b4d0b9e6c89429d167d79a3b2e2580e241c (diff)
parent17eda7d0bed1d32a9b8f4a6a9d572aeabb43810a (diff)
downloadframeworks_base-d75a3b4d2cf0bf743cfc5fc6d908ea7e8a8fafd0.zip
frameworks_base-d75a3b4d2cf0bf743cfc5fc6d908ea7e8a8fafd0.tar.gz
frameworks_base-d75a3b4d2cf0bf743cfc5fc6d908ea7e8a8fafd0.tar.bz2
am 17eda7d0: am 4d907643: Merge "Frameworks/base: Fix trivial equals implementation"
* commit '17eda7d0bed1d32a9b8f4a6a9d572aeabb43810a': Frameworks/base: Fix trivial equals implementation
-rw-r--r--core/java/android/text/util/Linkify.java4
1 files changed, 0 insertions, 4 deletions
diff --git a/core/java/android/text/util/Linkify.java b/core/java/android/text/util/Linkify.java
index 8e9eb48..c119277 100644
--- a/core/java/android/text/util/Linkify.java
+++ b/core/java/android/text/util/Linkify.java
@@ -525,10 +525,6 @@ public class Linkify {
return 0;
}
-
- public final boolean equals(Object o) {
- return false;
- }
};
Collections.sort(links, c);