tree 8e5390b1020573a4965e40711b8b791ed4719a3c
parent 907a33bce9457a8b27de35c554856dc6d45b0d9b
parent 3e0f56df1a22b76f59d85699d0cc78c37ddd37c5
author James Dong <jdong@google.com> 1336428563 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336428563 -0700

am 3e0f56df: Merge "Get rid of vendor specific video encoder component names from ACodec and OMXCodec" into jb-dev

* commit '3e0f56df1a22b76f59d85699d0cc78c37ddd37c5':
  Get rid of vendor specific video encoder component names from ACodec and OMXCodec