OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ecc897 cb57f4f)
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)
* commit 'cb57f4f6b8057b2208fac9f2bea497e03ebeec46':
  Add a new API on DRM Framework for streaming


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help