tree f80bf1b11945098b43fd5589b8d99eee96f4476f
parent 8eeb6678f74ff53b62a3c1b73da58593db59af2b
author Abhisek Devkota <ciwrl@cyanogenmod.com> 1439412155 -0700
committer Abhisek Devkota <ciwrl@cyanogenmod.com> 1439412368 -0700

Revert "Switch to our external/conscrypt"

Bekit/Arcee prefer PS1 solution for 12.1 branch. 12.0 and 11.0 will be unaffected.

This reverts commit 8eeb6678f74ff53b62a3c1b73da58593db59af2b.

Change-Id: Ie9c22d7bbd2edf9a040c5a33837c3bf155d34759