resolve merge conflicts of bdc6074276 to master.

Change-Id: Ieea1b33867acc7a6dd17f0340f30a66c29ce4359

diff --cc Android.mk
index 2adad1f,500a572..72db1ab
--- 1/Android.mk
--- 2/Android.mk
+++ b/Android.mk
@@@ -1,15 -1,8 +1,15 @@@
  LOCAL_PATH:= $(call my-dir)
  include $(CLEAR_VARS)
  
- LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common ims-common
+ LOCAL_JAVA_LIBRARIES := bouncycastle core-oj telephony-common ims-common
 -LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305
 +LOCAL_STATIC_JAVA_LIBRARIES := \
 +    android-support-v4 \
 +    android-support-v13 \
 +    android-support-v7-recyclerview \
 +    android-support-v7-preference \
 +    android-support-v7-appcompat \
 +    android-support-v14-preference \
 +    jsr305
  
  LOCAL_MODULE_TAGS := optional
  

diff --cc src/com/android/settings/CredentialStorage.java
Simple merge