OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f85c337 17029dd)
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)
* commit '1dac4cdd6faba15426a0b37a7a615c04f5a35394':
  Initial OMA DRM forward lock contribution


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