tree fdb605c8f6deabcb9ae373f86ab64670e858644b
parent f3c7f03eaefc2a89ce28b5ee1abf4056643546e8
parent 4df3123b6b3ef93ddb67ff0dbc8d94f5a4cebfe3
author James Dong <jdong@google.com> 1349309095 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349309095 -0700

am a9ba91a8: am d69fd4d2: Merge "Enable hdcp for WiFi display" into jb-mr1-dev

* commit 'a9ba91a8b8656aa4d735aba5d9631549d1b50496':
  Enable hdcp for WiFi display