Merge "NPE on configuring library documentation" into studio-1.1-dev automerge: f6969bc
automerge: 91d6a03
* commit '91d6a037a8301767ac2afa65367f9d771df5722b':
NPE on configuring library documentation
diff --git a/android/src/com/android/tools/idea/gradle/customizer/AbstractDependenciesModuleCustomizer.java b/android/src/com/android/tools/idea/gradle/customizer/AbstractDependenciesModuleCustomizer.java
index 1e00d07..eed9864 100644
--- a/android/src/com/android/tools/idea/gradle/customizer/AbstractDependenciesModuleCustomizer.java
+++ b/android/src/com/android/tools/idea/gradle/customizer/AbstractDependenciesModuleCustomizer.java
@@ -119,7 +119,7 @@
// have source attachments, but the library may have been already created. Here we just add the "source" paths if they were not already
// set.
updateLibrarySourcesIfAbsent(library, sourcePaths, OrderRootType.SOURCES);
- updateLibrarySourcesIfAbsent(library, documentationPaths, OrderRootType.DOCUMENTATION);
+ updateLibrarySourcesIfAbsent(library, documentationPaths, JavadocOrderRootType.getInstance());
// Add external annotations.
// TODO: Add this to the model instead!
