am ee6c7e49: Merge change I2c5380a6 into eclair-mr2

Merge commit 'ee6c7e491bac0ee12a4c662cd0bd21c7a8cb2f16' into eclair-mr2-plus-aosp

* commit 'ee6c7e491bac0ee12a4c662cd0bd21c7a8cb2f16':
  Fix a bug in the Settings contract class (introduced in an ... iffy ... fix