tree 6993687d0c39d4fe3303d40166c0ad7450e9e969
parent d4e1887f8271bb9ae1888f37bd6f211f9e08fb6f
parent 503fd99039e61035234be47db9e76bcd92f12194
author Suchi Amalapurapu <asuchitra@google.com> 1274219874 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274219874 -0700

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