am f6f545f6: Merge "Fix the build" into klp-dev

* commit 'f6f545f6a7601c9c0b7f6132488cced1d3a0d78b': Fix the build
2013-10-14 17:48:00 -07:00
parent d0383e37bd f6f545f6a7
commit 588bfeeaad
1 changed files with 0 additions and 2 deletions
--- a/core/java/android/app/WallpaperManager.java
+++ b/core/java/android/app/WallpaperManager.java
@@ -702,8 +702,6 @@ public class WallpaperManager {
        // cropper doesn't exist, return null
        throw new IllegalArgumentException("Cannot use passed URI to set wallpaper; " +
            "check that the type returned by ContentProvider matches image/*");
-
-        return null;
    }

    /**