diff options
| author | Dmitriy Ivanov <dimitry@google.com> | 2014-10-14 11:05:28 -0700 |
|---|---|---|
| committer | Dmitriy Ivanov <dimitry@google.com> | 2014-10-14 11:05:28 -0700 |
| commit | b307dcd8715ea4ffa456d819e8e8812719d5e760 (patch) | |
| tree | 067a95fcc95bb726528523ec07033a91ed87fd41 | |
| parent | 5d678db3c63992ff9fb0b2b2ed6126ef0fe79ef8 (diff) | |
| parent | 3f95c89db68f4d609c0ccafa4e9e7376852c9b48 (diff) | |
| download | core-b307dcd8715ea4ffa456d819e8e8812719d5e760.tar.gz core-b307dcd8715ea4ffa456d819e8e8812719d5e760.tar.bz2 core-b307dcd8715ea4ffa456d819e8e8812719d5e760.zip | |
resolved conflicts for merge of 3f95c89d to lmp-mr1-dev-plus-aosp
Change-Id: Iac27dc93675c3111129fc594eaaff7f1d6f5c26f
| -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 67222d77b..30bef463d 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 |