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, 2 insertions, 2 deletions

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/RootsToWorkingCopies.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/RootsToWorkingCopies.java
index 06138b345b74..c33dd38f2eba 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/RootsToWorkingCopies.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/RootsToWorkingCopies.java
@@ -105,7 +105,7 @@ public class RootsToWorkingCopies implements VcsListener {
 
   @CalledInBackground
   @Nullable
-  public WorkingCopy getWcRoot(final VirtualFile root) {
+  public WorkingCopy getWcRoot(@NotNull VirtualFile root) {
     assert (! ApplicationManager.getApplication().isDispatchThread()) || ApplicationManager.getApplication().isUnitTestMode();
 
     synchronized (myLock) {
@@ -117,7 +117,7 @@ public class RootsToWorkingCopies implements VcsListener {
   }
 
   @Nullable
-  private WorkingCopy calculateRoot(final VirtualFile root) {
+  private WorkingCopy calculateRoot(@NotNull VirtualFile root) {
     File workingCopyRoot = SvnUtil.getWorkingCopyRootNew(new File(root.getPath()));
     WorkingCopy workingCopy = null;