commit efd48d488e1381dd81a822c502126d32004491b4
author Colin Cross <ccross@android.com> Wed Apr 12 00:06:02 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 12 00:06:07 2017 +0000
tree e491b53441b0a51b6f9812e2cb93908a35c5abb2
parent f4c673beb0d1f8523b6e35117b0f55c315d08348
parent 851198c871c7ea39ec01139d631c47e2c3d2da37

Merge "Fix compiling with javac" into oc-dev

vehicle-hal-support-lib/src/com/android/car/vehiclehal/Utils.java

diff --git a/vehicle-hal-support-lib/src/com/android/car/vehiclehal/Utils.java b/vehicle-hal-support-lib/src/com/android/car/vehiclehal/Utils.java
index 34fd9cb..2a923bb 100644
--- a/vehicle-hal-support-lib/src/com/android/car/vehiclehal/Utils.java
+++ b/vehicle-hal-support-lib/src/com/android/car/vehiclehal/Utils.java
@@ -17,14 +17,14 @@
 package com.android.car.vehiclehal;
 
 import android.util.SparseArray;
-import com.android.car.vehiclehal.Utils.SparseArrayIterator.SparseArrayEntry;
 import java.util.Iterator;
 
 class Utils {
     private Utils() {}
 
     static class SparseArrayIterator<T>
-            implements Iterable<SparseArrayEntry<T>>, Iterator<SparseArrayEntry<T>> {
+            implements Iterable<SparseArrayIterator.SparseArrayEntry<T>>,
+                Iterator<SparseArrayIterator.SparseArrayEntry<T>> {
         static class SparseArrayEntry<U> {
             public final int key;
             public final U value;