| commit | c3f497ae7d841ea59da6e1ffc9c2c5237149173f | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Wed Mar 18 16:54:33 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 18 16:54:33 2015 +0000 |
| tree | d0835286eba5053d44ded9a67ee046bfb7592aea | |
| parent | fb9ff42d7401d0a2c58140fe306460852ea51167 [diff] | |
| parent | 4ff668d47ab9f49ec81606aec6d469ecd6ca37fa [diff] |
am 4ff668d4: Track change to Conscrypt * commit '4ff668d47ab9f49ec81606aec6d469ecd6ca37fa': Track change to Conscrypt