commit | 5eb187beaf2c7781012bfa44303951862166be7c | [log] [tgz] |
---|---|---|
author | Mark Salyzyn <salyzyn@google.com> | Wed May 21 21:23:26 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 21 21:23:26 2014 +0000 |
tree | 6c5c9d11b54130ec2a46b8666a3db7977d470761 | |
parent | 3d2f5d6edb271ee69ec6d6e76621f703399aa33a [diff] | |
parent | 1309152ec189e670d1c246bbabe1f33942e401b1 [diff] |
am 1309152e: am 1fe58202: am ea65c191: Merge "libctest: zap" * commit '1309152ec189e670d1c246bbabe1f33942e401b1': libctest: zap