tree 0422f3db33932997a0727e7a532e7fc7852a9de3
parent f6495f895df8a85092edf07feca905bcd978534e
parent 0717235eb5a5b761f3549f1c2b8c94019b9d6220
author Brett Chabot <brettchabot@android.com> 1285623477 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285623477 -0700

am 0717235e: Merge "Split CTS device setup into separate stages." into gingerbread

Merge commit '0717235eb5a5b761f3549f1c2b8c94019b9d6220' into gingerbread-plus-aosp

* commit '0717235eb5a5b761f3549f1c2b8c94019b9d6220':
  Split CTS device setup into separate stages.