tree 961df3f7a530cccc45382747da34c295417139fc
parent 3aa4f5314ecc9105c8c2b5c642767f90fff96457
parent f2437506e19700c90698bc12a81b6a6fdb473b94
author Elliott Hughes <enh@google.com> 1439845990 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439845990 +0000

am f2437506: am 8025096e: am 28595721: Merge "Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core."

* commit 'f2437506e19700c90698bc12a81b6a6fdb473b94':
  Replace HAVE_MS_C_RUNTIME with _WIN32 in system/core.