Merge "Fix getBuiltInWallpaper method" into klp-dev

author Michael Jurka <mikejurka@google.com>

Tue, 15 Oct 2013 03:49:13 +0000 (03:49 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 15 Oct 2013 03:49:13 +0000 (03:49 +0000)
author Michael Jurka <mikejurka@google.com>
Tue, 15 Oct 2013 03:49:13 +0000 (03:49 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 15 Oct 2013 03:49:13 +0000 (03:49 +0000)
diff --cc core/java/android/app/WallpaperManager.java
Simple merge
author	Michael Jurka <mikejurka@google.com>
	Tue, 15 Oct 2013 03:49:13 +0000 (03:49 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 15 Oct 2013 03:49:13 +0000 (03:49 +0000)