OSDN Git Service

Merge "Update of DRM framework"
authorGloria Wang <gwang@google.com>
Tue, 2 Nov 2010 21:45:02 +0000 (14:45 -0700)
committerAndroid Code Review <code-review@android.com>
Tue, 2 Nov 2010 21:45:02 +0000 (14:45 -0700)

Trivial merge