tree afa4c1de11ca3295ad28815bb21fda3a2132ea6a
parent 5baa50511804ac2d2a612a5e69338928b7920072
parent 5b4618897e6e6fda29600d66a74d0f3f1024338a
author Dan Albert <danalbert@google.com> 1429056741 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429056741 +0000

am 5b461889: am 15d0bc57: Merge "Fix LD_LIBRARY_PATH for host tests after update."

* commit '5b4618897e6e6fda29600d66a74d0f3f1024338a':
  Fix LD_LIBRARY_PATH for host tests after update.