am 0a93d875: Merge "StorageManager: Clean up and generalize storage...
am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2
* commit '0a93d875':
StorageManager: Clean up and generalize storage configuration resources