Kenny Root 9eed9e962c Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE ...

This reverts commit 4ff668d47ab9f49ec81606aec6d469ecd6ca37fa.

Bug: 19894176
Change-Id: I3cabec555f46b535720c58db73d9116d83a239dd

2015-03-31 09:15:37 -07:00

..

java/android/security

Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE

2015-03-31 09:15:37 -07:00

tests

Correct test data size in keystore signing and verification tests.

2014-09-14 17:09:47 +00:00

MODULE_LICENSE_APACHE2

…

NOTICE

…