am 3fb62752: am 392edec1: Merge from open-source froyo

Merge commit '3fb627525e077fa5452a99ac1e2a7e9c41995044' into gingerbread-plus-aosp

* commit '3fb627525e077fa5452a99ac1e2a7e9c41995044':
  Fix a bug where we cleaned an apps external data when upgrading it. :(