am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP...
am 7361b741: am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo
Merge commit '7361b741' into kraken
* commit '7361b741':
Uncomment a test that was marked as STOPSHIP