tree 6881d4572f6f86e7271e3d1c4e1ade3bb117e4d1
parent 410f9bd13773ec84c0258536e800b1e446e27521
parent f18429e3d6bf0d955f66160644de0672f045872a
author Andrew Hsieh <andrewhsieh@google.com> 1356716919 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1356716919 -0800

am f18429e3: Merge "Fix _STLP_USE_EXCEPTIONS"

* commit 'f18429e3d6bf0d955f66160644de0672f045872a':
  Fix _STLP_USE_EXCEPTIONS