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

Change-Id: Iac27dc93675c3111129fc594eaaff7f1d6f5c26f
This commit is contained in:
Dmitriy Ivanov 2014-10-14 11:05:28 -07:00
commit b307dcd871

View file

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