am 77ba51b0: am e9dee57b: Merge change I9d34c514 into eclair

Merge commit '77ba51b00989bb61aafecacd864588892cd97f74' into eclair-mr2-plus-aosp

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