| commit | 7a8c6714ab38a3bfc1e283c8eef48f76169c776c | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Mar 18 17:34:36 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 18 17:34:36 2015 +0000 |
| tree | 16b4282815477f58fbbe5e0190dc9f61b11298e4 | |
| parent | bf54a8af3b9abdb98b6b8398df692d65714c5141 [diff] | |
| parent | 61ecb53e73747b6400ba1cc2ffa2877c32a68fcd [diff] |
am 61ecb53e: resolved conflicts for merge of fb9ff42d to lmp-mr1-dev-plus-aosp * commit '61ecb53e73747b6400ba1cc2ffa2877c32a68fcd': Track change to Conscrypt