tree b057b54041552b5f889e1d558a15412cf3d4de43
parent adca8d0f4b2e9d229da56eeda587590c79aa036b
parent bf5d85e633d5818b47e5fd92d69bec7963fc3d52
author Andreas Huber <andih@google.com> 1348817652 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1348817652 -0700

am bf5d85e6: am 5cfd237f: Merge "Prepend SPS/PPS manually before encryption in HDCP mode. This is" into jb-mr1-dev

* commit 'bf5d85e633d5818b47e5fd92d69bec7963fc3d52':
  Prepend SPS/PPS manually before encryption in HDCP mode. This is