tree 13a5b7d95cdc95d49d17576391215d6b8840184a
parent 06b2ea822b6cb54d85e13649329c792b6bf0e0ce
parent 22e6857f669118a6b86114de13b5de6f98339c61
author Dan Albert <danalbert@google.com> 1427439631 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427439631 +0000

am 552d827f: am a6ad2e7e: am 42f11922: Merge "Pull in Windows compatibility header."

* commit '552d827f7e12e8b838c8f5c7e935ed2c9f1952f5':
  Pull in Windows compatibility header.