am e9dee57b: Merge change I9d34c514 into eclair

Merge commit 'e9dee57b15297de41c5127d075751a7215704f20' into eclair-mr2

* commit 'e9dee57b15297de41c5127d075751a7215704f20':
  Disable orientation change based on sensor in the wallpaper picker.