am f96cb307: Merge "Add Protips to all builds." into froyo

Merge commit 'f96cb307e3c6d0eb08fd3e4a17d1d1af7c46d385' into froyo-plus-aosp

* commit 'f96cb307e3c6d0eb08fd3e4a17d1d1af7c46d385':
  Add Protips to all builds.