am 25358610: am 45c029e1: am 9fbeed7c: am 7507929d: Merge "Fix Copyright Headers" into froyo

Merge commit '253586101e3987d06eb95ed4f51f2c6a4d828e83'

* commit '253586101e3987d06eb95ed4f51f2c6a4d828e83':
  Fix Copyright Headers