summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Deepanshu Gupta <deepanshu@google.com> 2016-02-18 04:53:24 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-02-18 04:53:25 +0000
commitd95e445394546b0cd58ded7dbd533ba5a21a01c2 (patch)
tree9076a1624fc790f2f89d2b65c817a3115fb30375
parent48cad7fa07ee5dd92f3f10ac80040a2639eb0ec0 (diff)
parent3b6ea2e3a8545fb6e9a62079fa4fcdbe859b0d49 (diff)
Merge "Entry -> Map.Entry. Fixes build break" into nyc-dev
-rw-r--r--tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java
index 0e66baaf7cbf..746ef3675f87 100644
--- a/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java
+++ b/tools/layoutlib/bridge/src/android/graphics/FontFamily_Delegate.java
@@ -73,7 +73,7 @@ public class FontFamily_Delegate {
private static final Map<String, FontInfo> sCache =
new LinkedHashMap<String, FontInfo>(CACHE_SIZE) {
@Override
- protected boolean removeEldestEntry(Entry<String, FontInfo> eldest) {
+ protected boolean removeEldestEntry(Map.Entry<String, FontInfo> eldest) {
return size() > CACHE_SIZE;
}