tree bf6dd9e322d082c45db1274a6211e104ae8fb017
parent 22060e5a1711d2bf0ddefe98f50060f4b4b32df2
parent f147b722ad2405c7f92ea8691f36b04a82d62bb1
author Andreas Huber <andih@google.com> 1346275368 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346275368 -0700

am f147b722: Merge "Preliminary support for HDCP as a binder service for wifi display support." into jb-mr1-dev

* commit 'f147b722ad2405c7f92ea8691f36b04a82d62bb1':
  Preliminary support for HDCP as a binder service for wifi display support.