commit | c74630bcbdc6f9a88a019b7ced6fbe7a58675ea2 | [log] [tgz] |
---|---|---|
author | Chong Zhang <chz@google.com> | Wed Sep 04 15:11:34 2013 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 04 15:11:34 2013 -0700 |
tree | 17d90ae9436c4d4d8988d3767099519a72a465ef | |
parent | bef614789efa7300e54703f5505f94a3f2acda5c [diff] | |
parent | a19912554f3779fac0c341ac702227bf4b5fe399 [diff] |
am a1991255: Merge "wifi-display: do not use HDCP\'s encryptNative method if its unsupported" into klp-dev * commit 'a19912554f3779fac0c341ac702227bf4b5fe399': wifi-display: do not use HDCP's encryptNative method if its unsupported