Jeff Tinker 267803d2c5 resolve merge conflicts of 907e26c to master ...

Change-Id: I9dc9f6943192fe2d39d87f0405953b63794123bc

2016-06-17 15:36:23 -07:00

..

drawable-hdpi

Widevine sample player

2011-04-07 09:35:25 -07:00

drawable-ldpi

Widevine sample player

2011-04-07 09:35:25 -07:00

drawable-mdpi

Widevine sample player

2011-04-07 09:35:25 -07:00

layout

Rework WidevineSamplePlayer to use fragments

2016-06-13 11:27:03 -07:00

values

resolve merge conflicts of 907e26c to master

2016-06-17 15:36:23 -07:00