tree 98438616f9e048f0371574e21b01ecd8dbc0cb25
parent 8d61889074faf8430b37877235bac658d68e34c3
parent 474dac4d0c5760d47dfb6ac52f6d9fc733fd2208
author Mark Salyzyn <salyzyn@google.com> 1398870787 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1398870787 +0000

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

* commit '474dac4d0c5760d47dfb6ac52f6d9fc733fd2208':
  stlport: if we can not throw, let us abort