tree 5c83fe1caf9666e420dff515351ebd7d2a323945
parent 7b80c1381581bd3c0c28440236e043888c49087d
parent 9c1cbe8373f28c9a6d6ba489af3e9247647dc469
author Elliott Hughes <enh@google.com> 1389744691 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389744691 +0000

am 9c1cbe83: am 53cd1484: am aead003c: Merge "Don\'t set LD_LIBRARY_PATH globally."

* commit '9c1cbe8373f28c9a6d6ba489af3e9247647dc469':
  Don't set LD_LIBRARY_PATH globally.