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

* commit '518e6f3e932563d8a3ead37d04703ca4e5b0191a':
  Add StorageManager Test