diff options
| author | Tor Norbye <tnorbye@google.com> | 2013-03-13 16:47:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-03-13 16:47:52 +0000 |
| commit | 11a3406fe5ae2cceeb4bcb98b898bf72bbae003a (patch) | |
| tree | 9da30261bd9df4350611a2edbdc1e56846109081 /eclipse/plugins | |
| parent | 32a550a85537d8360d0906307ac5c21aafa93c3e (diff) | |
| parent | 66178f2afe1ac08d5419a5e356f0e03a600a1f63 (diff) | |
| download | sdk-11a3406fe5ae2cceeb4bcb98b898bf72bbae003a.zip sdk-11a3406fe5ae2cceeb4bcb98b898bf72bbae003a.tar.gz sdk-11a3406fe5ae2cceeb4bcb98b898bf72bbae003a.tar.bz2 | |
Merge "Fix nullness annotation"
Diffstat (limited to 'eclipse/plugins')
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ public final class Sdk { * @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); } |