am 5a5c6adf: am a968f1b1: am 518e6f3e: am f15665a8: Merge "Add StorageManager Test" into gingerbread

* commit '5a5c6adf23ed745a6e7340c0b49226f7f3827be8':
  Add StorageManager Test