tree d91aacd5b9e43e1f26c00376535e03feca402eac
parent 7126aedfb2f907e34b14ed63d90eb24326ed7521
parent 1162db78ec2055097edbb1e8d30159dfaa51fc12
author Dan Willemsen <dwillemsen@google.com> 1441335764 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441335764 +0000

am 1162db78: Merge "Stop checking HOST_OS"

* commit '1162db78ec2055097edbb1e8d30159dfaa51fc12':
  Stop checking HOST_OS