am c9259447: am ddf8fe50: Merge "Fix isUsbMassStorageConnected() will always return true" into gingerbread

Merge commit 'c925944733207b83aaa81cf7a92c38eb48443470'

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