tree 8e5390b1020573a4965e40711b8b791ed4719a3c
parent f12758bb17eaeacac5ed9bde6976ef83854cdbff
parent 706bb450ee7eb56691c61b40284136d9e2228444
author James Dong <jdong@google.com> 1336502033 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1336502033 -0700

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

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