| commit | 2974cb9fb2d97a734d427eeae99655684e6d0b16 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Mar 18 18:28:59 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 18 18:28:59 2015 +0000 |
| tree | 16b4282815477f58fbbe5e0190dc9f61b11298e4 | |
| parent | 7a8c6714ab38a3bfc1e283c8eef48f76169c776c [diff] | |
| parent | a52b0988f27a0bfe88d38aee5133c25264913f68 [diff] |
am a52b0988: resolved conflicts for merge of c3f497ae to lmp-mr1-dev-plus-aosp * commit 'a52b0988f27a0bfe88d38aee5133c25264913f68': Track change to Conscrypt