commit aa3a5400d6790e22c03c2fcf9fdcb7758ad23482
author Tor Norbye <tnorbye@google.com> Tue Mar 26 14:41:33 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 26 14:41:33 2013 -0700
tree 91272d2ec8db4774936a3c3739a44afdce4d4c8e
parent 5b4029847df08738034734b403eb529f703c1215
parent cb7bc2202a407887e331450c1592d8d0078c586b

am cb7bc220: am 2c79fef8: Merge "Add missing @NonNull annotations on overridden method"

* commit 'cb7bc2202a407887e331450c1592d8d0078c586b':
  Add missing @NonNull annotations on overridden method

eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java
index baeb154..093072b 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/build/builders/PostCompilerBuilder.java
@@ -17,6 +17,8 @@
 package com.android.ide.eclipse.adt.internal.build.builders;
 
 import com.android.SdkConstants;
+import com.android.annotations.NonNull;
+import com.android.annotations.Nullable;
 import com.android.ide.eclipse.adt.AdtConstants;
 import com.android.ide.eclipse.adt.AdtPlugin;
 import com.android.ide.eclipse.adt.AndroidPrintStream;
@@ -913,8 +915,9 @@
     }
 
     @Override
-    protected void abortOnBadSetup(IJavaProject javaProject, ProjectState projectState)
-            throws AbortBuildException, CoreException {
+    protected void abortOnBadSetup(
+            @NonNull IJavaProject javaProject,
+            @Nullable ProjectState projectState) throws AbortBuildException, CoreException {
         super.abortOnBadSetup(javaProject, projectState);
 
         IProject iProject = getProject();