1 files changed, 13 insertions, 14 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
index fcc674d7f6..83020c433e 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ParsedAndroidData.java
@@ -41,7 +41,6 @@ import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Callable;
@@ -112,13 +111,13 @@ public class ParsedAndroidData {
     /** Copies the data to the targetBuilder from the current builder. */
     public void copyTo(Builder targetBuilder) {
       KeyValueConsumers consumers = targetBuilder.consumers();
-      for (Entry<DataKey, DataResource> entry : overwritingResources.entrySet()) {
+      for (Map.Entry<DataKey, DataResource> entry : overwritingResources.entrySet()) {
         consumers.overwritingConsumer.accept(entry.getKey(), entry.getValue());
       }
-      for (Entry<DataKey, DataResource> entry : combiningResources.entrySet()) {
+      for (Map.Entry<DataKey, DataResource> entry : combiningResources.entrySet()) {
         consumers.combiningConsumer.accept(entry.getKey(), entry.getValue());
       }
-      for (Entry<DataKey, DataAsset> entry : assets.entrySet()) {
+      for (Map.Entry<DataKey, DataAsset> entry : assets.entrySet()) {
         consumers.assetConsumer.accept(entry.getKey(), entry.getValue());
       }
       targetBuilder.conflicts.addAll(conflicts);
@@ -565,36 +564,36 @@ public class ParsedAndroidData {
   }
 
   void writeResourcesTo(AndroidResourceSymbolSink writer) {
-    for (Entry<DataKey, DataResource> resource : iterateDataResourceEntries()) {
+    for (Map.Entry<DataKey, DataResource> resource : iterateDataResourceEntries()) {
       resource.getValue().writeResourceToClass((FullyQualifiedName) resource.getKey(), writer);
     }
   }
 
   void writeResourcesTo(AndroidDataWriter writer) throws MergingException {
-    for (Entry<DataKey, DataResource> resource : iterateDataResourceEntries()) {
+    for (Map.Entry<DataKey, DataResource> resource : iterateDataResourceEntries()) {
       resource.getValue().writeResource((FullyQualifiedName) resource.getKey(), writer);
     }
   }
 
   void serializeResourcesTo(AndroidDataSerializer serializer) {
-    for (Entry<DataKey, DataResource> resource : iterateDataResourceEntries()) {
+    for (Map.Entry<DataKey, DataResource> resource : iterateDataResourceEntries()) {
       serializer.queueForSerialization(resource.getKey(), resource.getValue());
     }
   }
 
   void writeAssetsTo(AndroidDataWriter writer) throws IOException {
-    for (Entry<DataKey, DataAsset> resource : iterateAssetEntries()) {
+    for (Map.Entry<DataKey, DataAsset> resource : iterateAssetEntries()) {
       resource.getValue().writeAsset((RelativeAssetPath) resource.getKey(), writer);
     }
   }
 
   void serializeAssetsTo(AndroidDataSerializer serializer) {
-    for (Entry<DataKey, DataAsset> resource : iterateAssetEntries()) {
+    for (Map.Entry<DataKey, DataAsset> resource : iterateAssetEntries()) {
       serializer.queueForSerialization(resource.getKey(), resource.getValue());
     }
   }
 
-  Iterable<Entry<DataKey, DataResource>> iterateOverwritableEntries() {
+  Iterable<Map.Entry<DataKey, DataResource>> iterateOverwritableEntries() {
     return overwritingResources.entrySet();
   }
 
@@ -635,7 +634,7 @@ public class ParsedAndroidData {
   ParsedAndroidData combine(ParsedAndroidData other) {
     Map<DataKey, DataResource> combinedResources = new LinkedHashMap<>();
     CombiningConsumer consumer = new CombiningConsumer(combinedResources);
-    for (Entry<DataKey, DataResource> entry :
+    for (Map.Entry<DataKey, DataResource> entry :
         Iterables.concat(combiningResources.entrySet(), other.combiningResources.entrySet())) {
       consumer.accept(entry.getKey(), entry.getValue());
     }
@@ -665,11 +664,11 @@ public class ParsedAndroidData {
         ImmutableMap.copyOf(Iterables.concat(assets.entrySet(), other.assets.entrySet())));
   }
 
-  private Iterable<Entry<DataKey, DataResource>> iterateDataResourceEntries() {
+  private Iterable<Map.Entry<DataKey, DataResource>> iterateDataResourceEntries() {
     return Iterables.concat(overwritingResources.entrySet(), combiningResources.entrySet());
   }
 
-  public Iterable<Entry<DataKey, DataResource>> iterateCombiningEntries() {
+  public Iterable<Map.Entry<DataKey, DataResource>> iterateCombiningEntries() {
     return combiningResources.entrySet();
   }
 
@@ -677,7 +676,7 @@ public class ParsedAndroidData {
     return assets.containsKey(name);
   }
 
-  Iterable<Entry<DataKey, DataAsset>> iterateAssetEntries() {
+  Iterable<Map.Entry<DataKey, DataAsset>> iterateAssetEntries() {
     return assets.entrySet();
   }