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/src/com/google/common/collect/ForwardingTable.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/src/com/google/common/collect/ForwardingTable.java')
| -rw-r--r-- | guava/src/com/google/common/collect/ForwardingTable.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/guava/src/com/google/common/collect/ForwardingTable.java b/guava/src/com/google/common/collect/ForwardingTable.java index 92cc876..2c59705 100644 --- a/guava/src/com/google/common/collect/ForwardingTable.java +++ b/guava/src/com/google/common/collect/ForwardingTable.java @@ -16,6 +16,7 @@ package com.google.common.collect; +import com.google.common.annotations.Beta; import com.google.common.annotations.GwtCompatible; import java.util.Collection; @@ -31,6 +32,7 @@ import java.util.Set; * @author Gregory Kick * @since 7.0 */ +@Beta @GwtCompatible public abstract class ForwardingTable<R, C, V> extends ForwardingObject implements Table<R, C, V> { |