OSDN Git Service

am 1309152e: am 1fe58202: am ea65c191: Merge "libctest: zap"
authorMark Salyzyn <salyzyn@google.com>
Wed, 21 May 2014 21:23:26 +0000 (21:23 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 21 May 2014 21:23:26 +0000 (21:23 +0000)
commit5eb187beaf2c7781012bfa44303951862166be7c
tree6c5c9d11b54130ec2a46b8666a3db7977d470761
parent3d2f5d6edb271ee69ec6d6e76621f703399aa33a
parent1309152ec189e670d1c246bbabe1f33942e401b1
am 1309152e: am 1fe58202: am ea65c191: Merge "libctest: zap"

* commit '1309152ec189e670d1c246bbabe1f33942e401b1':
  libctest: zap