tree 6c5c9d11b54130ec2a46b8666a3db7977d470761
parent 3d2f5d6edb271ee69ec6d6e76621f703399aa33a
parent 1309152ec189e670d1c246bbabe1f33942e401b1
author Mark Salyzyn <salyzyn@google.com> 1400707406 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1400707406 +0000

am 1309152e: am 1fe58202: am ea65c191: Merge "libctest: zap"

* commit '1309152ec189e670d1c246bbabe1f33942e401b1':
  libctest: zap