tree 5445e8e5e8c1a2006eed1d9ca40dcfabcb414deb
parent 3d10a04589f012634641d893079becb4229b6954
author Joey Hewitt <joey@joeyhewitt.com> 1439395778 -0700
committer Abhisek Devkota <ciwrl@cyanogenmod.com> 1439407403 -0700

Switch to our external/conscrypt

Fix CVE-2015-3825

Change-Id: Icd33dfc8dcb037bfb3c296abf24e7a75bc55031a