tree bd6af1f69e399fb06d7515592985261beebe1a91
parent 0cb19f84fe899d26cb895aab809bad0d0efc494f
parent 134912df4b2ad74dcb60bc691761234154fe0265
author Elliott Hughes <enh@google.com> 1491032623 +0000
committer android-build-merger <android-build-merger@google.com> 1491032623 +0000

Merge "Only use environment variables on the host." am: 5d8b8310aa
am: 134912df4b

Change-Id: Iaf46637324b5a6594c152b373638f0eafafffb97