From 5075e88da7ad9e7456b898167dda85fb8e97db70 Mon Sep 17 00:00:00 2001
From: Abhisek Devkota <ciwrl@cyanogenmod.com>
Date: Wed, 12 Aug 2015 13:42:35 -0700
Subject: [PATCH] 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
---
 default.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index cbe271f6..9025e9e9 100644
--- a/default.xml
+++ b/default.xml
@@ -120,7 +120,7 @@
   <project path="external/cmockery" name="platform/external/cmockery" remote="aosp" />
   <project path="external/compiler-rt" name="platform/external/compiler-rt" groups="pdk" remote="aosp" />
   <project path="external/connectivity" name="CyanogenMod/android_external_connectivity" />
-  <project path="external/conscrypt" name="CyanogenMod/android_external_conscrypt" groups="pdk-cw-fs" />
+  <project path="external/conscrypt" name="platform/external/conscrypt" groups="pdk-cw-fs" remote="aosp" />
   <project path="external/curl" name="CyanogenMod/android_external_curl" />
   <project path="external/deqp" name="platform/external/deqp" remote="aosp" />
   <project path="external/dexmaker" name="platform/external/dexmaker" groups="pdk-cw-fs" remote="aosp" />