tree bb756da431e7ccbb6d7f576982bec3df0f770483
parent 438ea34b113751ad7f3a6fa323931f6c6fc1db63
parent 4b84a5a7192289ee54ebba157d9b6490b4d500ba
author Nick Kralevich <nnk@google.com> 1404908202 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404908202 +0000

am 4b84a5a7: am dd3b86e2: am 927fbe57: Merge "mediaserver: fix HDCP failures"

* commit '4b84a5a7192289ee54ebba157d9b6490b4d500ba':
  mediaserver: fix HDCP failures