diff options
author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-14 19:05:21 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-14 19:05:21 +0000 |
commit | 484c55a5343828e3b22bf24414e0d3caf3b68f7c (patch) | |
tree | 4d4d6499ce973d7942aa2e0604f7e53c5c0a084d /rootdir | |
parent | d2813a26b42feebe76c4f1093f1953d022c5e376 (diff) | |
parent | b307dcd8715ea4ffa456d819e8e8812719d5e760 (diff) | |
download | system_core-484c55a5343828e3b22bf24414e0d3caf3b68f7c.zip system_core-484c55a5343828e3b22bf24414e0d3caf3b68f7c.tar.gz system_core-484c55a5343828e3b22bf24414e0d3caf3b68f7c.tar.bz2 |
am b307dcd8: resolved conflicts for merge of 3f95c89d to lmp-mr1-dev-plus-aosp
* commit 'b307dcd8715ea4ffa456d819e8e8812719d5e760':
Remove libsigchain from LD_PRELOADs
Diffstat (limited to 'rootdir')
-rw-r--r-- | rootdir/init.environ.rc.in | 1 |
1 files changed, 0 insertions, 1 deletions
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 @@ on init export LOOP_MOUNTPOINT /mnt/obb export BOOTCLASSPATH %BOOTCLASSPATH% export SYSTEMSERVERCLASSPATH %SYSTEMSERVERCLASSPATH% - export LD_PRELOAD libsigchain.so |