commit 484c55a5343828e3b22bf24414e0d3caf3b68f7c
author Dmitriy Ivanov <dimitry@google.com> Tue Oct 14 19:05:21 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Oct 14 19:05:21 2014 +0000
tree 4d4d6499ce973d7942aa2e0604f7e53c5c0a084d
parent d2813a26b42feebe76c4f1093f1953d022c5e376
parent b307dcd8715ea4ffa456d819e8e8812719d5e760

am b307dcd8: resolved conflicts for merge of 3f95c89d to lmp-mr1-dev-plus-aosp

* commit 'b307dcd8715ea4ffa456d819e8e8812719d5e760':
  Remove libsigchain from LD_PRELOADs

rootdir/init.environ.rc.in

diff --git a/rootdir/init.environ.rc.in b/rootdir/init.environ.rc.in
index 67222d7..30bef46 100644
--- a/rootdir/init.environ.rc.in
+++ b/rootdir/init.environ.rc.in
@@ -10,4 +10,3 @@
     export LOOP_MOUNTPOINT /mnt/obb
     export BOOTCLASSPATH %BOOTCLASSPATH%
     export SYSTEMSERVERCLASSPATH %SYSTEMSERVERCLASSPATH%
-    export LD_PRELOAD libsigchain.so