tree 52e2b11d66d67e535a8ec8b833bfbb4fafefa40a
parent 31825c119907af5b24dc916df56a3efd2715af79
parent 70a1ee38b24a7c8dfc789db024bdf54f277ddba3
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.