tree 2d4c30c88cd360e62bdaed7179654fdacf812aba
parent 85956a6595666fa3a7ed6142e998184bf47cc1e9
parent f45002335606a9edb181814fbdf8d0a4e1468a9d
author Andreas Huber <andih@google.com> 1346275520 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346275520 -0700

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

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