Gloria Wang 09ba5cebb2 resolved conflicts for merge of c761a80d to master ...

Change-Id: I0c0474b95d66c23310d04b7a7f4c9571a211582c

2011-03-14 11:56:39 -07:00

..

common

Fix for bug 3477330

2011-03-10 16:20:48 -08:00

drmserver

- Some change on the DrmManager in order to support feature request 4082089.

2011-03-11 14:54:23 -08:00

java/android/drm

To support uri started with http:// in some Java APIs

2011-03-07 10:41:41 -08:00

jni

Update of DRM Framework.

2010-11-19 22:02:51 +09:00

libdrmframework

resolved conflicts for merge of c761a80d to master

2011-03-14 11:56:39 -07:00