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

Conflicts:
	.idea/modules.xml
	platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdatesXmlLoader.java

Change-Id: Id899dae9a1e1c79272f8a70e14a7dcef4f760d7f

1 files changed, 3 insertions, 1 deletions

diff --git a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarIdeView.java b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarIdeView.java
index 13ab984a7620..5a32f4d0531b 100644
--- a/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarIdeView.java
+++ b/platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarIdeView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2011 JetBrains s.r.o.
+ * Copyright 2000-2014 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,6 +22,7 @@ import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.pom.Navigatable;
 import com.intellij.psi.*;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 
@@ -48,6 +49,7 @@ public final class NavBarIdeView implements IdeView {
     myPanel.hideHint();
   }
 
+  @NotNull
   @Override
   public PsiDirectory[] getDirectories() {
     final PsiDirectory dir = myPanel.getSelectedElement(PsiDirectory.class);