OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 69d2513 ad1ff47)
am ad1ff472: am 7bbc79fd: am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm...
authorNarayan Kamath <narayan@google.com>
Thu, 19 Dec 2013 13:14:17 +0000 (13:14 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 19 Dec 2013 13:14:17 +0000 (13:14 +0000)
* commit 'ad1ff47213e1b3a34a2b9e5a189742e9a15ed486':
  MediaDrm#mNativeContext is a long, not int.


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