Clean up code that directly imports nested classes like Builder, Entry, etc.

PiperOrigin-RevId: 195100125

1 files changed, 1 insertions, 2 deletions

diff --git a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
index a0fb3e36da..18040ea6a6 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ManifestMergerAction.java
@@ -35,7 +35,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.logging.Logger;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
@@ -200,7 +199,7 @@ public class ManifestMergerAction {
       Path tmp = Files.createTempDirectory("manifest_merge_tmp");
       tmp.toFile().deleteOnExit();
       ImmutableMap.Builder<Path, String> mergeeManifests = ImmutableMap.builder();
-      for (Entry<Path, String> mergeeManifest : options.mergeeManifests.entrySet()) {
+      for (Map.Entry<Path, String> mergeeManifest : options.mergeeManifests.entrySet()) {
         mergeeManifests.put(
             removePermissions(mergeeManifest.getKey(), tmp), mergeeManifest.getValue());
       }