Merge "Validate wallpaper dimension while generating crop" into qt-dev am: 5d4aa134a9

author Ahan Wu <ahanwu@google.com>

Wed, 6 Nov 2019 04:26:11 +0000 (20:26 -0800)

committer android-build-merger <android-build-merger@google.com>

Wed, 6 Nov 2019 04:26:11 +0000 (20:26 -0800)
author Ahan Wu <ahanwu@google.com>
Wed, 6 Nov 2019 04:26:11 +0000 (20:26 -0800)
committer android-build-merger <android-build-merger@google.com>
Wed, 6 Nov 2019 04:26:11 +0000 (20:26 -0800)
diff --cc services/core/java/com/android/server/wallpaper/WallpaperManagerService.java
Simple merge
author	Ahan Wu <ahanwu@google.com>
	Wed, 6 Nov 2019 04:26:11 +0000 (20:26 -0800)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 6 Nov 2019 04:26:11 +0000 (20:26 -0800)