| commit | affff329088e569158e0ee45ee0e580b3c285722 | [log] [tgz] |
|---|---|---|
| author | Kenny Root <kroot@google.com> | Mon Nov 03 18:50:21 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Nov 03 18:50:21 2014 +0000 |
| tree | aa9877e8f1d83b7edcacc470c8098b80495de83d | |
| parent | f9de10252f96a136784de9d79cfcc1ab9e30d13f [diff] | |
| parent | d00ced983ee235f72a9261fd967309a2638dde05 [diff] |
am d00ced98: am b0cb0734: Merge "Track change to Conscrypt" * commit 'd00ced983ee235f72a9261fd967309a2638dde05': Track change to Conscrypt