OSDN Git Service

(root) / android-x86 / frameworks-av.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e93a33a f8bf4ac)
am f8bf4acb: am fd1d6df5: (-s ours) am c2153d0d: DO NOT MERGE Part of fix for libmedi...
authorJeff Tinker <jtinker@google.com>
Fri, 21 Aug 2015 16:36:44 +0000 (16:36 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Aug 2015 16:36:44 +0000 (16:36 +0000)
* commit 'f8bf4acb505d8058e75b8b6f19738ee2c9a4322e':
  DO NOT MERGE Part of fix for libmedia OOB write anywhere


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