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

* commit 'b307dcd8715ea4ffa456d819e8e8812719d5e760':
  Remove libsigchain from LD_PRELOADs
This commit is contained in:
Dmitriy Ivanov 2014-10-14 19:05:21 +00:00 committed by Android Git Automerger
commit 484c55a534
1 changed files with 0 additions and 1 deletions

View File

@ -10,4 +10,3 @@ on init
export LOOP_MOUNTPOINT /mnt/obb
export BOOTCLASSPATH %BOOTCLASSPATH%
export SYSTEMSERVERCLASSPATH %SYSTEMSERVERCLASSPATH%
export LD_PRELOAD libsigchain.so