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

* commit 'e0887cc7febe2a03f1685e4aa3cb131c455d8cd0':
  Squash ANRs in UsbStorageActivity.