OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4890484 4554ffd)
am 4554ffd7: (-s ours) am 6272fa1b: Merge "DO NOT MERGE Fix vulnerability in mediaser...
authorJeff Tinker <jtinker@google.com>
Thu, 17 Sep 2015 17:38:12 +0000 (17:38 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 17 Sep 2015 17:38:12 +0000 (17:38 +0000)
* commit '4554ffd7a1c4bc6973c11c00f5a19aa260e18100':
  DO NOT MERGE Fix vulnerability in mediaserver


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