tree 6993687d0c39d4fe3303d40166c0ad7450e9e969
parent 997776cdc76a77bfe7d4904c35d604166d65df1f
parent 77ee720aad0d5d650f30d213d195b39c11c39a05
author Jaikumar Ganesh <jaikumar@google.com> 1274219769 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1274219769 -0700

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