tree 4f53344d9daf3db11243f6dce6b50a0e7deb98a6
parent 53d6fdd8b43ad5e48ee1c5921c4a18a11cd2d0b0
parent 60c6100473658bc5978f760a8ef3a549fb539d7a
author Dan Willemsen <dwillemsen@google.com> 1441396148 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1441396148 +0000

am 60c61004: am e7154be8: Merge "Remove last HOST_OS check"

* commit '60c6100473658bc5978f760a8ef3a549fb539d7a':
  Remove last HOST_OS check