OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90ed94c afa4049)
am a220a297: Merge "Initial OMA DRM forward lock contribution"
authorGloria Wang <gwang@google.com>
Thu, 13 Jan 2011 19:11:51 +0000 (11:11 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 13 Jan 2011 19:11:51 +0000 (11:11 -0800)
* commit 'a220a2979937700024662be0f8fc166ca65506ed':
  Initial OMA DRM forward lock contribution


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