tree 98438616f9e048f0371574e21b01ecd8dbc0cb25
parent dff52d8c0314389d316b98c8b640482d7ea2e165
parent 61384bb399e6d3c29d054e956131d140d8f4caea
author Mark Salyzyn <salyzyn@google.com> 1398879344 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398879344 +0000

am 61384bb3: am 5db5d6d3: am 474dac4d: Merge "stlport: if we can not throw, let us abort"

* commit '61384bb399e6d3c29d054e956131d140d8f4caea':
  stlport: if we can not throw, let us abort