Merge commit '0a27865a015d9e0401b6b3bff9eedd06d59043b3' into eclair-mr2-plus-aosp * commit '0a27865a015d9e0401b6b3bff9eedd06d59043b3': Unbreak setting photos as wallpaper
Merge commit '0a27865a015d9e0401b6b3bff9eedd06d59043b3' into eclair-mr2-plus-aosp * commit '0a27865a015d9e0401b6b3bff9eedd06d59043b3': Unbreak setting photos as wallpaper