| commit | 5db5d6d307d80011811ffc0db7b29d882c7a631e | [log] [tgz] |
|---|---|---|
| author | Mark Salyzyn <salyzyn@google.com> | Wed Apr 30 15:13:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 30 15:13:07 2014 +0000 |
| tree | 98438616f9e048f0371574e21b01ecd8dbc0cb25 | |
| parent | 8d61889074faf8430b37877235bac658d68e34c3 [diff] | |
| parent | 474dac4d0c5760d47dfb6ac52f6d9fc733fd2208 [diff] |
am 474dac4d: Merge "stlport: if we can not throw, let us abort" * commit '474dac4d0c5760d47dfb6ac52f6d9fc733fd2208': stlport: if we can not throw, let us abort