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

Conflicts:
	.idea/modules.xml

Change-Id: I5e3d04bc83cdc26b2b56fca66b44b1dd8941b143

1 files changed, 3 insertions, 3 deletions

diff --git a/platform/util/src/com/intellij/util/containers/OrderedSet.java b/platform/util/src/com/intellij/util/containers/OrderedSet.java
index 9900eb92e800..0ff04acbe345 100644
--- a/platform/util/src/com/intellij/util/containers/OrderedSet.java
+++ b/platform/util/src/com/intellij/util/containers/OrderedSet.java
@@ -104,19 +104,19 @@ public class OrderedSet<T> extends ArrayList<T> implements Set<T>, RandomAccess
   }
 
   @Override
-  public boolean addAll(final int index, final Collection<? extends T> c) {
+  public boolean addAll(final int index, @NotNull final Collection<? extends T> c) {
     throw new UnsupportedOperationException();
   }
 
   @Override
-  public T set(final int index, final T element) {
+  public T set(final int index, @NotNull final T element) {
     final T removed = remove(index);
     add(index, element);
     return removed;
   }
 
   @Override
-  public void add(final int index, final T element) {
+  public void add(final int index, @NotNull final T element) {
     if (myHashSet.add(element)){
       super.add(index, element);
     }