Merge "Fix the build" into klp-dev

2013-10-15 00:42:51 +00:00
parent 4d0f069238 5d1893bafb
commit f6f545f6a7
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;
    }

    /**