Automated g4 rollback of changelist 160182040

PiperOrigin-RevId: 160190881

1 files changed, 6 insertions, 14 deletions

diff --git a/tensorflow/contrib/android/java/org/tensorflow/contrib/android/TensorFlowInferenceInterface.java b/tensorflow/contrib/android/java/org/tensorflow/contrib/android/TensorFlowInferenceInterface.java
index b1d18d2faf..1f180429b2 100644
--- a/tensorflow/contrib/android/java/org/tensorflow/contrib/android/TensorFlowInferenceInterface.java
+++ b/tensorflow/contrib/android/java/org/tensorflow/contrib/android/TensorFlowInferenceInterface.java
@@ -17,7 +17,6 @@ package org.tensorflow.contrib.android;
 
 import android.content.res.AssetManager;
 import android.os.Trace;
-import android.os.Build.VERSION;
 import android.text.TextUtils;
 import android.util.Log;
 import java.io.FileInputStream;
@@ -371,11 +370,9 @@ public class TensorFlowInferenceInterface {
   private void loadGraph(InputStream is, Graph g) throws IOException {
     final long startMs = System.currentTimeMillis();
 
-    if (VERSION.SDK_INT >= 18) {
-      Trace.beginSection("initializeTensorFlow");
-      Trace.beginSection("readGraphDef");
-    }
+    Trace.beginSection("initializeTensorFlow");
 
+    Trace.beginSection("readGraphDef");
     // TODO(ashankar): Can we somehow mmap the contents instead of copying them?
     byte[] graphDef = new byte[is.available()];
     final int numBytesRead = is.read(graphDef);
@@ -386,22 +383,17 @@ public class TensorFlowInferenceInterface {
               + " of the graph, expected to read "
               + graphDef.length);
     }
+    Trace.endSection();
 
-    if (VERSION.SDK_INT >= 18) {
-      Trace.endSection(); // readGraphDef.
-      Trace.beginSection("importGraphDef");
-    }
-
+    Trace.beginSection("importGraphDef");
     try {
       g.importGraphDef(graphDef);
     } catch (IllegalArgumentException e) {
       throw new IOException("Not a valid TensorFlow Graph serialization: " + e.getMessage());
     }
+    Trace.endSection();
 
-    if (VERSION.SDK_INT >= 18) {
-      Trace.endSection(); // importGraphDef.
-      Trace.endSection(); // initializeTensorFlow.
-    }
+    Trace.endSection(); // initializeTensorFlow.
 
     final long endMs = System.currentTimeMillis();
     Log.i(