OSDN Git Service

am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"
authorGloria Wang <gwang@google.com>
Thu, 13 Jan 2011 20:38:29 +0000 (12:38 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jan 2011 20:38:29 +0000 (12:38 -0800)
commit5dbe61d7d5259f884f48327214f697cc0963dba7
tree0f1364799787600afd95940bf753064f5b927da8
parentf85c337dadeabb2fed138de1764c19676d325162
parent17029ddb060b46100454cbc6c960889d12cc82f5
am 1dac4cdd: am a220a297: Merge "Initial OMA DRM forward lock contribution"

* commit '1dac4cdd6faba15426a0b37a7a615c04f5a35394':
  Initial OMA DRM forward lock contribution