commit 11a3406fe5ae2cceeb4bcb98b898bf72bbae003a
author Tor Norbye <tnorbye@google.com> Wed Mar 13 16:47:51 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 13 16:47:52 2013 +0000
tree 9da30261bd9df4350611a2edbdc1e56846109081
parent 32a550a85537d8360d0906307ac5c21aafa93c3e
parent 66178f2afe1ac08d5419a5e356f0e03a600a1f63

Merge "Fix nullness annotation"

eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java
index f187a3f..16df952 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java
@@ -329,7 +329,7 @@
      * @param log The logger for the {@link SdkManager}.
      * @return A new {@link SdkManager} parsing the same location.
      */
-    public @NonNull SdkManager getNewSdkManager(@NonNull ILogger log) {
+    public @Nullable SdkManager getNewSdkManager(@NonNull ILogger log) {
         return SdkManager.createManager(getSdkLocation(), log);
     }