diff options
| author | Kenny Root <kroot@google.com> | 2015-06-06 00:06:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-06 00:06:10 +0000 |
| commit | 33019c39f1aad75d763cd03f91c7b48cff50e75f (patch) | |
| tree | ce13eb358547a65e060df6acfd691c19a00b1f0c /harmony-tests/src/test | |
| parent | c77337772bca4d343a6e6e021021b207c5ce8675 (diff) | |
| parent | 3039ab33971b83fc8dfc7fded39810a2bdc917d1 (diff) | |
| download | libcore-33019c39f1aad75d763cd03f91c7b48cff50e75f.zip libcore-33019c39f1aad75d763cd03f91c7b48cff50e75f.tar.gz libcore-33019c39f1aad75d763cd03f91c7b48cff50e75f.tar.bz2 | |
am 3039ab33: am 81a0cd77: am a6eb9b5f: am 9585bbef: am d9b110bb: resolved conflicts for merge of d8b18995 to klp-modular-dev
* commit '3039ab33971b83fc8dfc7fded39810a2bdc917d1':
OpenSSLX509Certificate: mark mContext as transient
Diffstat (limited to 'harmony-tests/src/test')
0 files changed, 0 insertions, 0 deletions