tree f8d4d6329cf60b253c420e963963b76f48ef4e94
parent 87c7a0d74b9dadaedfe6805c57d221d9c445aaf6
parent 796fccb80d603bb79d2591047f1c3b83755bfa8b
author Elliott Hughes <enh@google.com> 1405044709 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405044709 +0000

am 796fccb8: Merge "Fix environment variable assignment in init"

* commit '796fccb80d603bb79d2591047f1c3b83755bfa8b':
  Fix environment variable assignment in init