tree 239a5bf48c535f9580278a1b3126492100a2162c
parent 454b2d1c34238ba33d8f6861971a74c80c3e302a
parent 782ffe91da665c6b1fb9e297faa6e0dc6035f40c
author James Dong <jdong@google.com> 1300390738 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1300390738 -0700

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

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