OSDN Git Service

(root) / android-x86 / system-media.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa257b9 5f125ab)
am 5f125ab1: resolved conflicts for dd82cb0f to stage-aosp-master
authorGlenn Kasten <gkasten@google.com>
Wed, 30 Sep 2015 23:51:03 +0000 (23:51 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 30 Sep 2015 23:51:03 +0000 (23:51 +0000)
* commit '5f125ab174f7d7a9e10a47f6af16cdd85c0253a7':
  Add fifo_tests


Trivial merge
system/media
About OSDN
Find Software
Develop Software
Help