am 7507929d: Merge "Fix Copyright Headers" into froyo

Merge commit '7507929d4881f099c211f8468e669be4e633b0de' into froyo

* commit '7507929d4881f099c211f8468e669be4e633b0de':
  Fix Copyright Headers