OSDN Git Service
(root)
/
android-x86
/
frameworks-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
23ce76c
8a6fb50
)
am 8a6fb50d: am 4e197ea8: am e15a73ee: Merge "Bug fixes in OMA DRM v1 Forward Lock...
author
Gloria Wang
<gwang@google.com>
Thu, 4 Aug 2011 21:47:43 +0000
(14:47 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Thu, 4 Aug 2011 21:47:43 +0000
(14:47 -0700)
* commit '
8a6fb50d69ec40a413b117bc9145a97ec427852f
':
Bug fixes in OMA DRM v1 Forward Lock Agent
1
2
drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.mk
Simple merge