am b0845b73: am bd7116f6: Merge "Group CtsVerifier Tests into Categories" into froyo

Merge commit 'b0845b736614d0d58ed288bdc77e66d3b3b96866' into gingerbread

* commit 'b0845b736614d0d58ed288bdc77e66d3b3b96866':
  Group CtsVerifier Tests into Categories