Merge commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc' into gingerbread-plus-aosp * commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc': Make sure OutOfMemoryError is handled by WallpaperManager
Merge commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc' into gingerbread-plus-aosp * commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc': Make sure OutOfMemoryError is handled by WallpaperManager