commit 66178f2afe1ac08d5419a5e356f0e03a600a1f63
author Tor Norbye <tnorbye@google.com> Wed Mar 06 16:34:09 2013 -0800
committer Tor Norbye <tnorbye@google.com> Wed Mar 06 17:22:01 2013 -0800
tree 68e31bbf6e17cc8944092e9d55bb9ac581ad9446
parent 57c54fd5b36c7d57cacd4cfa48b1c05149c95bf1

Fix nullness annotation

Method which is marked @NonNull delegates to a different method
in tools/base which is marked @Nullable.

Change-Id: I45810dc805e5d638d2d03929ceb580f6d7ec58f9

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);
     }