OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29638ab 7fa9667)
am 7fa9667f: Merge "Clarify how release of offline keys is handled in the MediaDrm...
authorJeff Tinker <jtinker@google.com>
Mon, 15 Apr 2013 20:13:39 +0000 (13:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 15 Apr 2013 20:13:39 +0000 (13:13 -0700)
* commit '7fa9667f63fe84a2d17ce899121f32bfcec98864':
  Clarify how release of offline keys is handled in the MediaDrm API


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