tree 698fb2d60c796a49f8d604fb2e89762b00300719
parent 0669b93b7492a67963a56700b0cf70085d71bf60
parent 04b830f1339f051f936d08bfc240675c1bdaaebe
author Dan Willemsen <dwillemsen@google.com> 1494894716 +0000
committer android-build-merger <android-build-merger@google.com> 1494894716 +0000

Merge "Revert "Revert "Ensure environment dependencies are correct"""
am: 04b830f133

Change-Id: Ie222f2c6f81ad193e608abc8da09fadb289e82ec