AI 143680: am: CL 143649 am: CL 143464 Proposal for a TestTimeout annotation that the CTS
  host (or an different test harness) should take into
  account.
  Original author: jorgp
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143680
1 file changed