diff options
| author | Ivan Gavrilovic <gavra@google.com> | 2018-05-08 02:26:09 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-05-08 02:26:09 -0700 |
| commit | 2b50d295f5acc8ddf8924cd6536dfbfe45965ade (patch) | |
| tree | 74deac1e16e97c2c13f226cd4635cd65abf19303 /java/com/google/devtools/common/options/OptionsBase.java | |
| parent | 301a69dfe6fbb59072b6c1af278ec31c10cbdf35 (diff) | |
| parent | 6beb00b4744298d2ef28b6590c31b6848885b28d (diff) | |
| download | desugar-2b50d295f5acc8ddf8924cd6536dfbfe45965ade.tar.gz | |
Merge remote-tracking branch upstream-master into master am: 9d2aa11004android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3
am: 6beb00b474
Change-Id: I5f801929d952fac02c0b652fb9003295f4bf7820
Diffstat (limited to 'java/com/google/devtools/common/options/OptionsBase.java')
| -rw-r--r-- | java/com/google/devtools/common/options/OptionsBase.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/java/com/google/devtools/common/options/OptionsBase.java b/java/com/google/devtools/common/options/OptionsBase.java index 6b9f2f1..9496c65 100644 --- a/java/com/google/devtools/common/options/OptionsBase.java +++ b/java/com/google/devtools/common/options/OptionsBase.java @@ -20,7 +20,6 @@ import java.lang.reflect.Field; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; /** * Base class for all options classes. Extend this class, adding public instance fields annotated @@ -93,7 +92,7 @@ public abstract class OptionsBase { public final String cacheKey() { StringBuilder result = new StringBuilder(getClass().getName()).append("{"); - for (Entry<String, Object> entry : asMap().entrySet()) { + for (Map.Entry<String, Object> entry : asMap().entrySet()) { result.append(entry.getKey()).append("="); Object value = entry.getValue(); |