OSDN Git Service

am cb57f4f6: (-s ours) am 7a52ba8a: Merge "Add a new API on DRM Framework for streaming"
authorJean-Baptiste Queru <jbq@google.com>
Wed, 23 May 2012 21:48:39 +0000 (14:48 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 23 May 2012 21:48:39 +0000 (14:48 -0700)
commitf222c03dfa4f8f017843324a991b8dc4ff2a7f37
treefd5c0310baf2f84a21ab2a8351b1203f55d52614
parent7ecc89743d43adeaf3d80c8d630fe37b23f8346e
parentcb57f4f6b8057b2208fac9f2bea497e03ebeec46
am cb57f4f6: (-s ours) am 7a52ba8a: Merge "Add a new API on DRM Framework for streaming"

* commit 'cb57f4f6b8057b2208fac9f2bea497e03ebeec46':
  Add a new API on DRM Framework for streaming