am 4d2f2058: Merge remote branch \'goog/gingerbread\' into manualmerge

* commit '4d2f2058ddeb36c8d6c96a277b58cdef897ddf88':
  Fix WifiInfoTest
  Update NO_DELIVERY_REPORTS list.
  Update Expectations File
  Remove Test Annotation Related Tools
  Clean Up VideoViewTest
  CTS: Fixes a possible "out of memory" exception
tree: 57c4148b8ec4afb95e34065c6930d5f0fbe0877f
  1. tests/