widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 907e26c to master

Browse Source 
Change-Id: I9dc9f6943192fe2d39d87f0405953b63794123bc
This commit is contained in:
Jeff Tinker
2016-06-17 15:36:23 -07:00
parent b77b6569e5 907e26c842
commit 267803d2c5
22 changed files with 284 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proprietary/samplePlayer/res/values/strings.xml
View File

@@ -13,6 +13,7 @@
<string name="show_rights">Show Rights</string>
<string name="streaming">Streaming</string>
<string name="downloads">Downloads</string>
<string name="settings">Settings</string>
<string name="content_page">Content Page</string>
<string name="device_id">Device Id</string>
@@ -20,4 +21,7 @@
<string name="portal_id">Portal Name</string>
<string name="update_button">Update Button</string>
<string name="no_classic">This device does not support Widevine classic playback."</string>
<string name="save_settings">Save Settings</string>
<string name="next_page">Next Page &gt;&gt;</string>
<string name="previous_page">&lt;&lt; Previous Page</string>
</resources>