tree c6115d2320c47a56e27ee2ca9352e8d5f2676411
parent a5579f7f71caef40cce145213a9579a5b3d3126c
parent 4e519cfe552aeea67fd082cadfecf41e445ff864
author Eric Fischer <enf@google.com> 1287507315 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287507315 -0700

am 4e519cfe: am ecf5b657: Refer to USB storage instead of SD card on devices without removable storage.

Merge commit '4e519cfe552aeea67fd082cadfecf41e445ff864'

* commit '4e519cfe552aeea67fd082cadfecf41e445ff864':
  Refer to USB storage instead of SD card on devices without removable storage.