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

Merge commit '83f002f758a54fbb7b690a3d0432cc911353eb18' into kraken

* commit '83f002f758a54fbb7b690a3d0432cc911353eb18':
  Add Protips to all builds.