am 2477fd69: Merge change Ic31c11ad into eclair

Merge commit '2477fd69492055f3c6ee62ed9993e9fde8283144' into eclair-plus-aosp

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