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

Merge commit 'f9b8e9018bf8ab012ec734262620d3274b2cd2ec'

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