| commit | 4547089af565343fe2f1afa18403419f78882472 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Thu Sep 12 12:09:20 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Sep 12 12:09:20 2013 -0700 |
| tree | 2edc2c71eb972a5bf7d6c01e6ee340b530838dd2 | |
| parent | 838a16dbf65eed80309c27d300c314b5a29c82df [diff] | |
| parent | 5bffb360f095cb6db5ae539d1571ec1be9e8fd35 [diff] |
am 5bffb360: resolved conflicts for merge of ecbc22ea to klp-dev-plus-aosp * commit '5bffb360f095cb6db5ae539d1571ec1be9e8fd35': Add libcore.conscrypt tests back to CTS