tree e45c499d0326668415c8987cfee32387ed98c6db
parent 2c3257b21ddf2a3da843f11d1bb3b4fa8e912707
parent 9c0c5b5638fd2810b68e033963026cc1830b9ade
author James Dong <jdong@google.com> 1300390269 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300390269 -0700

am 9c0c5b56: am 2f1f2248: Fix missing AOSP copyright headers for a bunch of media framework files

* commit '9c0c5b5638fd2810b68e033963026cc1830b9ade':
  Fix missing AOSP copyright headers for a bunch of media framework files