am 2dfe79f2: am c22a27d0: Merge remote branch \'goog/gingerbread\' into manualmerge

* commit '2dfe79f20b11b60bd8b3f2446506de6abb7c6e39':
  Revert "CTS: Fixes a possible "out of memory" exception"
  Fix for SmsManagerTest
  Add StorageManager Test
  Fix BuildVersionTest
  Add DownloadManager Test