tree 5274ae447f860c4509010ae4ff62519ccef52491
parent 19417537614b47bb6b25b6b7cb53e25e61c1177c
parent 17e338e712dd375a0000773bedabdbac510a3b2a
author Brett Chabot <brettchabot@android.com> 1257803350 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257803350 -0800

am 216438fc: (-s ours) am 83859891: am 3dc6a811: (-s ours) DO NOT MERGE. CTS test cleanup. Mark tests as KnownFailures and BrokenTests.

Merge commit '216438fc405d78069b1042cc21fc43dc85f860a9'

* commit '216438fc405d78069b1042cc21fc43dc85f860a9':
  DO NOT MERGE. CTS test cleanup. Mark tests as KnownFailures and BrokenTests.