Merge upstream into AOSP am: b3b9a496c8 am: 0d6829d18a

Change-Id: I1e12da2f674663fd498d62d653ceb4735130a082

1 files changed, 4 insertions, 4 deletions

diff --git a/java/com/google/turbine/binder/lookup/CompoundTopLevelIndex.java b/java/com/google/turbine/binder/lookup/CompoundTopLevelIndex.java
index de50a2e..b41edb0 100644
--- a/java/com/google/turbine/binder/lookup/CompoundTopLevelIndex.java
+++ b/java/com/google/turbine/binder/lookup/CompoundTopLevelIndex.java
@@ -62,14 +62,14 @@ public class CompoundTopLevelIndex implements TopLevelIndex {
   }
 
   @Override
-  public Scope lookupPackage(ImmutableList<String> packagename) {
+  public PackageScope lookupPackage(Iterable<String> packagename) {
     // When returning package scopes, build up a compound scope containing entries from all
     // indices with matching packages.
-    CompoundScope result = null;
+    PackageScope result = null;
     for (TopLevelIndex index : indexes) {
-      Scope packageScope = index.lookupPackage(packagename);
+      PackageScope packageScope = index.lookupPackage(packagename);
       if (packageScope != null) {
-        result = result == null ? CompoundScope.base(packageScope) : result.append(packageScope);
+        result = result == null ? packageScope : result.append(packageScope);
       }
     }
     return result;