resolved conflicts for merge of 3f95c89d to lmp-dev-plus-aosp

Change-Id: I5184dcfa91a11a210c60e60a4fffc26d2c9f116f
2014-10-14 10:50:59 -07:00 · 2014-10-14 10:50:59 -07:00 · 1e2bec489c
parent badcdc7a53 3f95c89db6
commit 1e2bec489c
1 changed files with 0 additions and 1 deletions
--- a/rootdir/init.environ.rc.in
+++ b/rootdir/init.environ.rc.in
@ -10,4 +10,3 @@ on init
    export LOOP_MOUNTPOINT /mnt/obb
    export BOOTCLASSPATH %BOOTCLASSPATH%
    export SYSTEMSERVERCLASSPATH %SYSTEMSERVERCLASSPATH%
-    export LD_PRELOAD libsigchain.so