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