am 31b5d548: Merge "Fix a bug where we cleaned an apps external data when upgrading it. :(" into gingerbread

Merge commit '31b5d5485f7336639d252da7ba979234dbd2f1e1' into gingerbread-plus-aosp

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