tree a694ce83e853e4bf76c399b7cc5a664de876cf3b
parent a59aaed81b47f59ee9ee724760c4c39fcf429a18
parent 2ffe74ded51ee73ae1b412861f5d6ec58c835390
author Jean-Baptiste Queru <jbq@google.com> 1281548439 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1281548439 -0700

am 2ffe74de: Merge "Fix isUsbMassStorageConnected() will always return true"

Merge commit '2ffe74ded51ee73ae1b412861f5d6ec58c835390' into gingerbread-plus-aosp

* commit '2ffe74ded51ee73ae1b412861f5d6ec58c835390':
  Fix isUsbMassStorageConnected() will always return true