| commit | f222c03dfa4f8f017843324a991b8dc4ff2a7f37 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed May 23 14:48:39 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 23 14:48:39 2012 -0700 |
| tree | fd5c0310baf2f84a21ab2a8351b1203f55d52614 | |
| parent | 7ecc89743d43adeaf3d80c8d630fe37b23f8346e [diff] | |
| parent | cb57f4f6b8057b2208fac9f2bea497e03ebeec46 [diff] |
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