OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 47a2377 4299a7c)
am 4299a7c2: am 940f8be3: Merge "Implement a NoOp DrmManagerClientImpl when no DRM...
authorAdam Lesinski <adamlesinski@google.com>
Tue, 10 Jun 2014 18:41:50 +0000 (18:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 10 Jun 2014 18:41:50 +0000 (18:41 +0000)
* commit '4299a7c2b049b07b3456a81a4c2b1030523c08ca':
  Implement a NoOp DrmManagerClientImpl when no DRM service exists


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