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