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

Merge commit '0b66ea65f7c43c7a39e91baf7a39945fc2ad6355' into eclair-mr2-plus-aosp

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