OSDN Git Service

am 4261ace0: resolved conflicts for merge of 9f312b81 to jb-dev-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Fri, 25 May 2012 14:35:53 +0000 (07:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 25 May 2012 14:35:53 +0000 (07:35 -0700)
* commit '4261ace0139d7bb864d002d7a65be66945ec8878':
  Enable DRM support in the SDK system image


Trivial merge