Merge "Change sensor timestamp format from date to seconds"
diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java
index 77a6e1c..82a8cb2 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java
@@ -43,7 +43,6 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -343,11 +342,11 @@
         if (event == null) {
             return mNaString;
         }
-        return mDateFormat.format(new Date(event.timestamp / (1000L * 1000L)));
+        return Double.toString(event.timestamp / (1000L * 1000L * 1000L)) + " seconds";
     }
 
     private String getTimestampNow() {
-        return mDateFormat.format(new Date(System.nanoTime() / (1000L * 1000L)));
+        return Double.toString(System.nanoTime() / (1000L * 1000L * 1000L)) + " seconds";
     }
 
     private String getFuelLevel(CarSensorEvent event) {