tree 2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parent 565d56d36278e238f1c8ac6d904337d799813d82
parent c6c11bdbe001329632d6633f7595f270198f8f42
author Jaikumar Ganesh <jaikumar@google.com> 1274219500 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274219500 -0700

am ef95aceb: Merge "Removing STOPSHIP logs." into froyo

Merge commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2' into froyo-plus-aosp

* commit 'ef95acebdc44a7cf2990c4302850fcb112b695d2':
  Removing STOPSHIP logs.