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

This reverts commit 693ea60e9e.

Bug: 19894176
Change-Id: I1514e8c55f541afb0c653afa57cd16034d1b167b

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

..

core

Revert "Track change to Conscrypt" DO NOT MERGE ANYWHERE

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

Android.mk

Track change to JSSE provider

2013-04-29 15:15:27 -07:00

AndroidManifest.xml

…