am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2

* commit '15afd076d6070374cbb4f9dcbe28dda67caa0718':
  MTP: Have GetStorageInfo command return correct storage type for removable storage
tree: acd808907bc8ff38da1e02c4406d566d62ab9697
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/