am 35602efe: (-s ours) am b07d6992: (-s ours) am d4610977: Merge "framework: Hide StorageManager for froyo - DO NOT MERGE" into froyo