OSDN Git Service

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)
commitdb778f498a657c08096fb4abde5a23bea52a709c
treea8c823dfc09e5bbae8c1a0486d8f8476fed59a09
parentaa257b9696fbcb0c6fcb290bc06c65e9c75e9889
parent5f125ab174f7d7a9e10a47f6af16cdd85c0253a7
am 5f125ab1: resolved conflicts for dd82cb0f to stage-aosp-master

* commit '5f125ab174f7d7a9e10a47f6af16cdd85c0253a7':
  Add fifo_tests