diff options
| author | Kenny Root <kroot@google.com> | 2013-04-29 23:30:40 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-04-29 23:30:40 -0700 |
| commit | 649143648073116b2ffb6af412b41ecec5280f86 (patch) | |
| tree | 3b85b8d1158410fa1c6063151416d1fe8c3c4d46 /Android.mk | |
| parent | 3b22f4d2da535cd865e8dfd9f06f3ce273e20c0f (diff) | |
| parent | 3c10f535786bf4676664b937b617ec891b0ee25b (diff) | |
| download | packages_apps_Settings-649143648073116b2ffb6af412b41ecec5280f86.zip packages_apps_Settings-649143648073116b2ffb6af412b41ecec5280f86.tar.gz packages_apps_Settings-649143648073116b2ffb6af412b41ecec5280f86.tar.bz2 | |
resolved conflicts for merge of 3c10f535 to jb-mr2-dev-plus-aosp
Change-Id: Id4ab035f92f2a8bf1b1fefdfd22ba370e33e7829
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,7 +1,7 @@ LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) -LOCAL_JAVA_LIBRARIES := bouncycastle telephony-common +LOCAL_JAVA_LIBRARIES := bouncycastle conscrypt telephony-common LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v13 jsr305 LOCAL_MODULE_TAGS := optional |