OSDN Git Service
(root)
/
android-x86
/
frameworks-av.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a923dd4
6047633
)
am 60476336: Remove obsolete drm manager code
author
Jeff Tinker
<jtinker@google.com>
Mon, 19 Aug 2013 21:21:48 +0000
(14:21 -0700)
committer
Android Git Automerger
<android-git-automerger@android.com>
Mon, 19 Aug 2013 21:21:48 +0000
(14:21 -0700)
* commit '
6047633622328711cc6b23667c8d6381bae179bf
':
Remove obsolete drm manager code
1
2
drm/common/IDrmManagerService.cpp
patch
|
diff1
|
diff2
|
blob
|
history
drm/drmserver/DrmManager.cpp
patch
|
diff1
|
diff2
|
blob
|
history
drm/drmserver/DrmManagerService.cpp
patch
|
diff1
|
diff2
|
blob
|
history
drm/libdrmframework/DrmManagerClientImpl.cpp
patch
|
diff1
|
diff2
|
blob
|
history
drm/libdrmframework/include/DrmManager.h
patch
|
diff1
|
diff2
|
blob
|
history
drm/libdrmframework/include/DrmManagerClientImpl.h
patch
|
diff1
|
diff2
|
blob
|
history
drm/libdrmframework/include/DrmManagerService.h
patch
|
diff1
|
diff2
|
blob
|
history
drm/libdrmframework/include/IDrmManagerService.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drm/common/IDrmManagerService.cpp
Simple merge
diff --cc
drm/drmserver/DrmManager.cpp
Simple merge
diff --cc
drm/drmserver/DrmManagerService.cpp
Simple merge
diff --cc
drm/libdrmframework/DrmManagerClientImpl.cpp
Simple merge
diff --cc
drm/libdrmframework/include/DrmManager.h
Simple merge
diff --cc
drm/libdrmframework/include/DrmManagerClientImpl.h
Simple merge
diff --cc
drm/libdrmframework/include/DrmManagerService.h
Simple merge
diff --cc
drm/libdrmframework/include/IDrmManagerService.h
Simple merge