diff options
| author | Paul Duffin <paulduffin@google.com> | 2015-01-19 12:46:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-19 12:46:40 +0000 |
| commit | aab56800fcb95e9b1a2d653588b14158080cc6b4 (patch) | |
| tree | 7365392c3ea77742021cf187acfd465f9bb774ab /guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableMap.java | |
| parent | 6fa98dbaae182b511fbeb331e08f5fb827715ea8 (diff) | |
| parent | 84fb43aa6a1e752487f2624055ff26b1b6b7c043 (diff) | |
| download | android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.tar.gz android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.tar.bz2 android_external_guava-aab56800fcb95e9b1a2d653588b14158080cc6b4.zip | |
am 84fb43aa: Merge "Revert "Upgraded Guava to unmodified v14.0.1""
* commit '84fb43aa6a1e752487f2624055ff26b1b6b7c043':
Revert "Upgraded Guava to unmodified v14.0.1"
Diffstat (limited to 'guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableMap.java')
| -rw-r--r-- | guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableMap.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableMap.java b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableMap.java index b79ce80..bdf536b 100644 --- a/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableMap.java +++ b/guava-gwt/src-super/com/google/common/collect/super/com/google/common/collect/RegularImmutableMap.java @@ -23,7 +23,7 @@ import java.util.Map; * * @author Hayward Chan */ -final class RegularImmutableMap<K, V> extends ForwardingImmutableMap<K, V> { +final class RegularImmutableMap<K, V> extends ImmutableMap<K, V> { RegularImmutableMap(Map<? extends K, ? extends V> delegate) { super(delegate); @@ -31,5 +31,5 @@ final class RegularImmutableMap<K, V> extends ForwardingImmutableMap<K, V> { RegularImmutableMap(Entry<? extends K, ? extends V>... entries) { super(entries); - } + } } |