Christopher Tate fb554aca11 am a0b07d2c: am 13006be1: Merge change 26457 into eclair
Merge commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7'

* commit 'a0b07d2c0297e8f10c2d98428b2acacb531cd5a7':
  Don't restore any setting that we don't think should be backed up
2009-09-23 11:38:07 -07:00
..