tree 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parent ce8ccb1e200f54082fdd0003b662fd1a3cb7d7b9
parent 4f7c9354c5f4368a7ef677252d00acf19df9b1b0
author Suchi Amalapurapu <asuchitra@google.com> 1274219617 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274219617 -0700

am 4a0823e5: Merge "Uncomment a test that was marked as STOPSHIP Add MediumTest tag" into froyo

Merge commit '4a0823e5486f16b10762076d629f2f7e4d5da476' into froyo-plus-aosp

* commit '4a0823e5486f16b10762076d629f2f7e4d5da476':
  Uncomment a test that was marked as STOPSHIP