diff options
| author | Kenny Root <kroot@google.com> | 2013-04-30 09:01:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-30 09:01:42 -0700 |
| commit | 152a43215143f62ee4bedda96ce73604530a6f1d (patch) | |
| tree | 75019f457262ba1052065b75d69cced8b3ac9ef8 | |
| parent | ada3291c8d13a9c3896102932abefed155a5b3fe (diff) | |
| parent | d14586e35a3df39cc3aa6aff6a54463270a5e1a7 (diff) | |
| download | system_core-152a43215143f62ee4bedda96ce73604530a6f1d.zip system_core-152a43215143f62ee4bedda96ce73604530a6f1d.tar.gz system_core-152a43215143f62ee4bedda96ce73604530a6f1d.tar.bz2 | |
am d14586e3: resolved conflicts for merge of a69af5af to jb-mr2-dev-plus-aosp
* commit 'd14586e35a3df39cc3aa6aff6a54463270a5e1a7':
Track change to JSSE provider
| -rw-r--r-- | rootdir/init.rc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index fb58a31..476f6d4 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -37,7 +37,7 @@ loglevel 3 export ANDROID_STORAGE /storage export ASEC_MOUNTPOINT /mnt/asec export LOOP_MOUNTPOINT /mnt/obb - export BOOTCLASSPATH /system/framework/core.jar:/system/framework/okhttp.jar:/system/framework/core-junit.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/mms-common.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/apache-xml.jar + export BOOTCLASSPATH /system/framework/core.jar:/system/framework/conscrypt.jar:/system/framework/okhttp.jar:/system/framework/core-junit.jar:/system/framework/bouncycastle.jar:/system/framework/ext.jar:/system/framework/framework.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/mms-common.jar:/system/framework/android.policy.jar:/system/framework/services.jar:/system/framework/apache-xml.jar # Backward compatibility symlink /system/etc /etc |