tree 6e2a5b9becc6eaef5f8658323b1851ee07d86156
parent 241b3333d1b66e7ce2ebe70d8890be7c58de817d
parent fdf761ba4b6ebbd9ce417a1714c82519af483ac8
author Eric Rowe <erowe@google.com> 1322519315 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1322519315 -0800

am 70a1ee38: am 500afb87: Merge "Fix SCO start stop tests." into ics-mr1

* commit '70a1ee38b24a7c8dfc789db024bdf54f277ddba3':
  Fix SCO start stop tests.