tree b8e41efbfa47a5bd8d75aa02ca15e6695112aa5b
parent 9940c8b6c8ab1711c9ee77cb9288888879b0b310
parent 2f1f2248c8439adbd686810e306c55f9e6a5abc3
author James Dong <jdong@google.com> 1300388165 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300388165 -0700

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

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