tree 617cf5e7186100e058abd5ceb3b92e7dbcdc1adb
parent b94d93e587776ed293b4457ce0c786416f5d9ccf
parent 91a0082fbc69ab77931ec58ea5a5fbf58331d8a5
author Dan Albert <danalbert@google.com> 1442012735 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1442012735 +0000

am 91a0082f: am da196abf: Merge "Fix `LOCAL_CXX_STL := none` for Windows."

* commit '91a0082fbc69ab77931ec58ea5a5fbf58331d8a5':
  Fix `LOCAL_CXX_STL := none` for Windows.