OSDN Git Service

am 2b1252dd: Merge "Update DrmOutputStream to use raw FileDescriptor."
authorJeff Sharkey <jsharkey@android.com>
Thu, 6 Feb 2014 22:17:18 +0000 (14:17 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 6 Feb 2014 22:17:18 +0000 (14:17 -0800)
* commit '2b1252ddd2650cb38918cb85d2a3711b2cfa8db5':
  Update DrmOutputStream to use raw FileDescriptor.


Trivial merge