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

Merge commit '45c029e1fb42761280830f5d3acba49d34531316' into gingerbread-plus-aosp

* commit '45c029e1fb42761280830f5d3acba49d34531316':
  Fix Copyright Headers