tree 681904ee413cd06066ec70c570baf9f697e9341f
parent 4138b33826ae0b17084574c1bdedb5738b89b69b
parent a905d9551103c5be465429ffeb0352b78058457e
author Jaikumar Ganesh <jaikumar@google.com> 1287171879 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287171879 -0700

am a905d955: am a31cbd61: Merge "Remove STOPSHIP and reduce log spam." into gingerbread

Merge commit 'a905d9551103c5be465429ffeb0352b78058457e'

* commit 'a905d9551103c5be465429ffeb0352b78058457e':
  Remove STOPSHIP and reduce log spam.