commit d3f0e0ae379f4420b01bb9de932a764c035ff2a6
author Brian Carlstrom <bdc@google.com> Wed Apr 03 14:03:13 2013 -0700
committer Brian Carlstrom <bdc@google.com> Wed Apr 03 14:03:13 2013 -0700
tree 8f9e753071a5bbf08eac924b576c09efd5990e54
parent 145d61e0c7f2584c65d6eb454496013408d707af
parent 02e8d73079e279fac152d1d3caf36afaeab6c5bf

resolved conflicts for merge of 02e8d730 to jb-mr2-dev-plus-aosp

Change-Id: I63d6a2f975a6c0df5c238a2f7592f357441eb767

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index e6583e3..e8871c4 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -37,7 +37,7 @@
     export ANDROID_STORAGE /storage
     export ASEC_MOUNTPOINT /mnt/asec
     export LOOP_MOUNTPOINT /mnt/obb
-    export BOOTCLASSPATH /system/framework/core.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/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