John "Juce" Bruce 31aa8eea04 resolved conflicts for merge of 7eea20df to master ...

Change-Id: Ibd8b16745d36b24041856f315fbb09a6c25cf4fb

2014-04-02 18:59:05 -07:00

..

properties_configuration.h

Backward compatibility for licenses and certificates

2013-08-22 09:37:18 -07:00

wv_content_decryption_module.h

resolved conflicts for merge of 7eea20df to master

2014-04-02 18:59:05 -07:00