resolve merge conflicts of 2bf95ac to nyc-dev-plus-aosp

Change-Id: Iaf232fbe65879bad6e19c7a9600aa6303a491a67
2016-04-12 17:15:40 -07:00
parent 49ef1342c1 2bf95acf7a
commit 6e2a8b11ec
11 changed files with 273 additions and 246 deletions
@@ -45,7 +45,7 @@ LOCAL_STATIC_LIBRARIES := \
    libmtdutils \
    libbase \
    libverifier \
-    libmincrypt \
+    libcrypto_utils_static \
    libcrypto_static \
    libminui \
    libminzip \