OSDN Git Service

am e6772914: Merge "HDCP: add enums for HDCP module capabilities" into klp-dev
authorChong Zhang <chz@google.com>
Wed, 4 Sep 2013 22:11:28 +0000 (15:11 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 4 Sep 2013 22:11:28 +0000 (15:11 -0700)
* commit 'e67729144a56966dd39e1bcda5efa51852e16d74':
  HDCP: add enums for HDCP module capabilities


Trivial merge