am e6874f9d: am 0b66ea65: am 2477fd69: Merge change Ic31c11ad into eclair

Merge commit 'e6874f9df43037b28bb5a8b315849db10d5d1a1e'

* commit 'e6874f9df43037b28bb5a8b315849db10d5d1a1e':
  Fix 2209086: restore drawable states when drawables change.