commit d23d26da08fa30c9b6159424ccd64dc6f778d586
author Kenny Root <kroot@google.com> Mon Apr 29 23:11:32 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 29 23:11:32 2013 -0700
tree 11c76be0bb44fbe82ff89acf35c2d693ab11556a
parent 89fb1a6c708e996329b4bcd2d0308cdd2fc268ae
parent 25ffb0d7c672bb0062a6ee44bbcea30de3f5c96b

am 25ffb0d7: Merge "Track change to JSSE provider"

* commit '25ffb0d7c672bb0062a6ee44bbcea30de3f5c96b':
  Track change to JSSE provider

tests/core/ctscore.mk

diff --git a/tests/core/ctscore.mk b/tests/core/ctscore.mk
index 1e4e017..95f4634 100644
--- a/tests/core/ctscore.mk
+++ b/tests/core/ctscore.mk
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle
+LOCAL_JAVA_LIBRARIES := android.test.runner bouncycastle conscrypt
 LOCAL_PROGUARD_ENABLED := disabled
 LOCAL_DEX_PREOPT := false