am a2a8419d: (-s ours) am e3b498be: DO NOT MERGE StorageManager: Add...
am a2a8419d: (-s ours) am e3b498be: DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods
* commit 'a2a8419d':
DO NOT MERGE StorageManager: Add getVolumeList() and getVolumeState() methods