tree c2a77ffb8e34c0ec890c1255d0c7473745e29b69
parent ef5a8424ecccff18570542328f594ac21eb65044
parent b1a62439436bc560940785c4ef6ee2d5f109c90c
author Elliott Hughes <enh@google.com> 1439947911 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439947911 +0000

am d0cae5b9: Merge "Remove a HAVE_MS_C_RUNTIME I missed."

* commit 'd0cae5b9fead406c38df5dd55bd7d41fe22a6719':
  Remove a HAVE_MS_C_RUNTIME I missed.