OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 480f4bb fe70827)
am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock Agent"
authorGloria Wang <gwang@google.com>
Thu, 4 Aug 2011 21:36:45 +0000 (14:36 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 4 Aug 2011 21:36:45 +0000 (14:36 -0700)
* commit '4e197ea8a6c5d5f4393a474591cccdd3fa27ecde':
  Bug fixes in OMA DRM v1 Forward Lock Agent


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