Merge remote-tracking branch 'aosp/upstream-master' into merge

Conflicts:
	.idea/modules.xml
	build/scripts/tests.gant

Change-Id: I9a1fe25b61f1004e0f62419a5f64e1452644b784

1 files changed, 9 insertions, 0 deletions

diff --git a/platform/projectModel-impl/src/com/intellij/openapi/roots/OrderEnumerationHandler.java b/platform/projectModel-impl/src/com/intellij/openapi/roots/OrderEnumerationHandler.java
index 83984e11a80b..7a62c35d0390 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/roots/OrderEnumerationHandler.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/roots/OrderEnumerationHandler.java
@@ -18,6 +18,7 @@ package com.intellij.openapi.roots;
 import com.intellij.openapi.extensions.ExtensionPointName;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -65,4 +66,12 @@ public abstract class OrderEnumerationHandler {
                                           @NotNull Collection<String> urls) {
     return false;
   }
+
+  public boolean addCustomModuleRoots(@NotNull OrderRootType type,
+                                      @NotNull ModuleRootModel rootModel,
+                                      @NotNull Collection<String> result,
+                                      boolean includeProduction,
+                                      boolean includeTests) {
+    return false;
+  }
 }