tree b74eaa493683ea4b81913ef7d71293198b8d7efe
parent 6e40664fc75e25ebeafda883fc2bba27279bebdd
parent 5cc072522b51f796085a73545a3dd34a02877059
author Robert Greenwalt <robdroid@android.com> 1270924922 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1270924922 -0700

am 5cc07252: Merge "Add warning magic to be a bit more reasonable." into froyo

Merge commit '5cc072522b51f796085a73545a3dd34a02877059' into froyo-plus-aosp

* commit '5cc072522b51f796085a73545a3dd34a02877059':
  Add warning magic to be a bit more reasonable.