tree a80e8d3efcc40aeb2192411400cb122b07e7fdd3
parent 49cf122d25e62c9f3dacad65eb5a7df5ab1e27b8
parent af16bf4f5160c03c858b32c40900f07f1e9c0366
author Elliott Hughes <enh@google.com> 1389744883 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389744883 +0000

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

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