Files
android/libwvdrmengine
John W. Bruce 1cd093795e Resolve Merge Disparity
The same merge conflict happened in the Widevine and Android repos, but
it was resolved differently. This patch brings the resolutions back in
sync.

Bug: 111504510
Bug: 111505796
Bug: 115358798
Test: Android Build
Change-Id: I5161ae3e1aad41ee034dc5fec59dad1c7699d65c
2019-01-15 16:46:14 -08:00
..
2019-01-15 00:24:52 -08:00
2019-01-07 10:14:25 -08:00
2019-01-15 00:24:52 -08:00
2019-01-15 00:24:52 -08:00
2019-01-15 00:24:52 -08:00
2018-04-16 16:38:05 -07:00
2019-01-15 00:24:52 -08:00
2019-01-15 16:46:14 -08:00
2019-01-15 00:24:52 -08:00
2018-11-22 00:33:30 +00:00

This is the source code for the Widevine Content Decryption Module (CDM) for the
Android OS.  It provides the libwvdrmengine plugin for DRM.

Partners who are integrating a device should be familiar with the documents in
the docs directory.

This source code is NOT open source, and is not part of AOSP.  However, it is
released to partners external to Google after official Android releases.  For
this reason, partners should look for bug fixes and software updates on the
widevine branches:

+------------------------------+------------------------------+
|Android Version               |Branch                        |
+------------------------------+------------------------------+
|Android L                     |lmp-mr1-widevine-release      |
+------------------------------+------------------------------+
|Android M MR1                 |mnc-mr1-widevine-release      |
+------------------------------+------------------------------+
|Android N MR2                 |nyc-mr2-widevine-release      |
+------------------------------+------------------------------+
|Android OC                    |oc-widevine-release           |
+------------------------------+------------------------------+
|Android OC MR1                |oc-mr1-widevine-release       |
+------------------------------+------------------------------+
|Android Pi                    |pi-widevine-release           |
+------------------------------+------------------------------+