am 5f5bcf50: am e0887cc7: Merge "Squash ANRs in UsbStorageActivity." into gingerbread

* commit '5f5bcf5039774050eec587dcc31905bd5a370b7b':
  Squash ANRs in UsbStorageActivity.