am a7c9dffd: am 4ed072f9: Merge "Add missing copyright headers to a couple of...
am a7c9dffd: am 4ed072f9: Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1
* commit 'a7c9dffd':
Add missing copyright headers to a couple of files