Merge commit 'd4610977d9217cbd70dd59f61914c74d1ca61036' into froyo-plus-aosp * commit 'd4610977d9217cbd70dd59f61914c74d1ca61036': framework: Hide StorageManager for froyo - DO NOT MERGE
Merge commit 'd4610977d9217cbd70dd59f61914c74d1ca61036' into froyo-plus-aosp * commit 'd4610977d9217cbd70dd59f61914c74d1ca61036': framework: Hide StorageManager for froyo - DO NOT MERGE