tree 64671bbc3d32b951c22339f6dee79086152629ee
parent 3958caaf89da87f09b561da1f674bb0c1a9cf132
parent c120d033c011e5943e74b6cde638d15fd02eb5b9
author Andreas Huber <andih@google.com> 1365780290 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1365780290 -0700

am c120d033: Merge "The framework really doesn\'t need to know the specifics of the codec" into jb-mr2-dev

* commit 'c120d033c011e5943e74b6cde638d15fd02eb5b9':
  The framework really doesn't need to know the specifics of the codec