summaryrefslogtreecommitdiff
path: root/java/com/google/devtools/build/android/desugar/BytecodeTypeInference.java
diff options
context:
space:
mode:
authorIvan Gavrilovic <gavra@google.com>2018-05-08 02:26:09 -0700
committerandroid-build-merger <android-build-merger@google.com>2018-05-08 02:26:09 -0700
commit2b50d295f5acc8ddf8924cd6536dfbfe45965ade (patch)
tree74deac1e16e97c2c13f226cd4635cd65abf19303 /java/com/google/devtools/build/android/desugar/BytecodeTypeInference.java
parent301a69dfe6fbb59072b6c1af278ec31c10cbdf35 (diff)
parent6beb00b4744298d2ef28b6590c31b6848885b28d (diff)
downloaddesugar-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/build/android/desugar/BytecodeTypeInference.java')
-rw-r--r--java/com/google/devtools/build/android/desugar/BytecodeTypeInference.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/java/com/google/devtools/build/android/desugar/BytecodeTypeInference.java b/java/com/google/devtools/build/android/desugar/BytecodeTypeInference.java
index 783069f..ce36071 100644
--- a/java/com/google/devtools/build/android/desugar/BytecodeTypeInference.java
+++ b/java/com/google/devtools/build/android/desugar/BytecodeTypeInference.java
@@ -19,6 +19,7 @@ import static com.google.common.base.Preconditions.checkState;
import com.google.auto.value.AutoValue;
import com.google.common.collect.ImmutableList;
+import com.google.devtools.build.android.desugar.io.BitFlags;
import java.util.ArrayList;
import java.util.Optional;
import javax.annotation.Nullable;