OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 242e1d2 2161b7c)
am 2161b7cb: Merge "Fix invalid keyType translation in MediaDrm.getKeyRequest" into...
authorJeff Tinker <jtinker@google.com>
Wed, 22 May 2013 19:14:13 +0000 (12:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 May 2013 19:14:13 +0000 (12:14 -0700)
* commit '2161b7cb79576b82a8f3bb964e25739e488d4c29':
  Fix invalid keyType translation in MediaDrm.getKeyRequest


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