tree 79cd5c310c4a84db8901474a6596ddbd9dd26acd
parent 7c7d76f47fc085219ad010c21b80e2ce521efb1b
parent 53cd1484aa13c43b4d6973c1c203dbff9c996d14
author Elliott Hughes <enh@google.com> 1389744519 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389744519 +0000

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

* commit '53cd1484aa13c43b4d6973c1c203dbff9c996d14':
  Don't set LD_LIBRARY_PATH globally.