tree cc6845aa01daf198af4540684c97e9e2bc87bd19
parent ab3d5036271a214e88ceb7482564e69c0249339e
parent aead003c8bc677218329c535b063a5bb66695414
author Elliott Hughes <enh@google.com> 1389744323 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389744323 -0800

am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."

* commit 'aead003c8bc677218329c535b063a5bb66695414':
  Don't set LD_LIBRARY_PATH globally.