am b07d6992: (-s ours) am d4610977: Merge "framework: Hide StorageManager for...
am b07d6992: (-s ours) am d4610977: Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo
Merge commit 'b07d6992' into kraken
* commit 'b07d6992':
framework: Hide StorageManager for froyo - DO NOT MERGE